From 0a381700cf8b45fe5ed8ad5c032a95777f0e6ab6 Mon Sep 17 00:00:00 2001
From: azure-sdk <azuresdk@microsoft.com>
Date: Fri, 12 Jun 2020 16:52:48 +0000
Subject: [PATCH 1/2] Update AutoRest C# version to
 https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200612.2/autorest-csharp-v3-3.0.0-dev.20200612.2.tgz

---
 eng/CodeGeneration.targets                    |   3 +-
 .../AppConfigurationManagementClient.cs       |  28 +-
 ...nt.cs => ConfigurationStoresOperations.cs} |  62 +-
 ...s => ConfigurationStoresRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  28 +-
 ...> PrivateEndpointConnectionsOperations.cs} |  34 +-
 ...ivateEndpointConnectionsRestOperations.cs} |   6 +-
 ...t.cs => PrivateLinkResourcesOperations.cs} |  26 +-
 ... => PrivateLinkResourcesRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 ...lient.cs => AvailabilitySetsOperations.cs} |  50 +-
 ...t.cs => AvailabilitySetsRestOperations.cs} |   6 +-
 .../src/Generated/ComputeManagementClient.cs  | 210 ++----
 ...ient.cs => ContainerServicesOperations.cs} |  42 +-
 ....cs => ContainerServicesRestOperations.cs} |   6 +-
 ...nt.cs => DedicatedHostGroupsOperations.cs} |  46 +-
 ...s => DedicatedHostGroupsRestOperations.cs} |   6 +-
 ...sClient.cs => DedicatedHostsOperations.cs} |  38 +-
 ...ent.cs => DedicatedHostsRestOperations.cs} |   6 +-
 ...ent.cs => DiskEncryptionSetsOperations.cs} |  46 +-
 ...cs => DiskEncryptionSetsRestOperations.cs} |   6 +-
 .../{DisksClient.cs => DisksOperations.cs}    |  54 +-
 ...ksRestClient.cs => DisksRestOperations.cs} |   6 +-
 ...leriesClient.cs => GalleriesOperations.cs} |  46 +-
 ...stClient.cs => GalleriesRestOperations.cs} |   6 +-
 ...> GalleryApplicationVersionsOperations.cs} |  38 +-
 ...lleryApplicationVersionsRestOperations.cs} |   6 +-
 ...nt.cs => GalleryApplicationsOperations.cs} |  38 +-
 ...s => GalleryApplicationsRestOperations.cs} |   6 +-
 ...t.cs => GalleryImageVersionsOperations.cs} |  38 +-
 ... => GalleryImageVersionsRestOperations.cs} |   6 +-
 ...esClient.cs => GalleryImagesOperations.cs} |  38 +-
 ...ient.cs => GalleryImagesRestOperations.cs} |   6 +-
 .../{ImagesClient.cs => ImagesOperations.cs}  |  46 +-
 ...sRestClient.cs => ImagesRestOperations.cs} |   6 +-
 ...icsClient.cs => LogAnalyticsOperations.cs} |  22 +-
 ...lient.cs => LogAnalyticsRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  20 +-
 ... => ProximityPlacementGroupsOperations.cs} |  46 +-
 ...ProximityPlacementGroupsRestOperations.cs} |   6 +-
 ...kusClient.cs => ResourceSkusOperations.cs} |  22 +-
 ...lient.cs => ResourceSkusRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 ...pshotsClient.cs => SnapshotsOperations.cs} |  54 +-
 ...stClient.cs => SnapshotsRestOperations.cs} |   6 +-
 ...ysClient.cs => SshPublicKeysOperations.cs} |  50 +-
 ...ient.cs => SshPublicKeysRestOperations.cs} |   6 +-
 .../{UsageClient.cs => UsageOperations.cs}    |  22 +-
 ...geRestClient.cs => UsageRestOperations.cs} |   6 +-
 ...irtualMachineExtensionImagesOperations.cs} |  26 +-
 ...alMachineExtensionImagesRestOperations.cs} |   6 +-
 ... => VirtualMachineExtensionsOperations.cs} |  34 +-
 ...VirtualMachineExtensionsRestOperations.cs} |   6 +-
 ...t.cs => VirtualMachineImagesOperations.cs} |  34 +-
 ... => VirtualMachineImagesRestOperations.cs} |   6 +-
 ...=> VirtualMachineRunCommandsOperations.cs} |  26 +-
 ...irtualMachineRunCommandsRestOperations.cs} |   6 +-
 ...ualMachineScaleSetExtensionsOperations.cs} |  38 +-
 ...achineScaleSetExtensionsRestOperations.cs} |   6 +-
 ...chineScaleSetRollingUpgradesOperations.cs} |  30 +-
 ...eScaleSetRollingUpgradesRestOperations.cs} |   6 +-
 ...lMachineScaleSetVMExtensionsOperations.cs} |  34 +-
 ...hineScaleSetVMExtensionsRestOperations.cs} |   6 +-
 ...=> VirtualMachineScaleSetVMsOperations.cs} |  78 +-
 ...irtualMachineScaleSetVMsRestOperations.cs} |   6 +-
 ...s => VirtualMachineScaleSetsOperations.cs} | 118 ++--
 ... VirtualMachineScaleSetsRestOperations.cs} |   6 +-
 ...nt.cs => VirtualMachineSizesOperations.cs} |  18 +-
 ...s => VirtualMachineSizesRestOperations.cs} |   6 +-
 ...Client.cs => VirtualMachinesOperations.cs} | 114 +--
 ...nt.cs => VirtualMachinesRestOperations.cs} |   6 +-
 ...lustersClient.cs => ClustersOperations.cs} |  46 +-
 ...estClient.cs => ClustersRestOperations.cs} |   6 +-
 ...onClient.cs => ConfigurationOperations.cs} |  22 +-
 ...ient.cs => ConfigurationRestOperations.cs} |   6 +-
 ...sClient.cs => ConsumerGroupsOperations.cs} |  34 +-
 ...ent.cs => ConsumerGroupsRestOperations.cs} |   6 +-
 ...s => DisasterRecoveryConfigsOperations.cs} |  62 +-
 ... DisasterRecoveryConfigsRestOperations.cs} |   6 +-
 .../Generated/EventHubsManagementClient.cs    |  56 +-
 ...ntHubsClient.cs => EventHubsOperations.cs} |  62 +-
 ...stClient.cs => EventHubsRestOperations.cs} |   6 +-
 ...pacesClient.cs => NamespacesOperations.cs} | 126 ++--
 ...tClient.cs => NamespacesRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  24 +-
 ...{RegionsClient.cs => RegionsOperations.cs} |  22 +-
 ...RestClient.cs => RegionsRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 .../src/Generated/KeyVaultManagementClient.cs |  28 +-
 .../{OperationsClient.cs => Operations.cs}    |  24 +-
 ...> PrivateEndpointConnectionsOperations.cs} |  26 +-
 ...ivateEndpointConnectionsRestOperations.cs} |   6 +-
 ...t.cs => PrivateLinkResourcesOperations.cs} |  18 +-
 ... => PrivateLinkResourcesRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 .../{VaultsClient.cs => VaultsOperations.cs}  |  78 +-
 ...sRestClient.cs => VaultsRestOperations.cs} |   6 +-
 ...nt.cs => ApplicationGatewaysOperations.cs} |  94 +--
 ...s => ApplicationGatewaysRestOperations.cs} |   6 +-
 ...=> ApplicationSecurityGroupsOperations.cs} |  46 +-
 ...pplicationSecurityGroupsRestOperations.cs} |   6 +-
 ...t.cs => AvailableDelegationsOperations.cs} |  22 +-
 ... => AvailableDelegationsRestOperations.cs} |   6 +-
 ...=> AvailableEndpointServicesOperations.cs} |  22 +-
 ...vailableEndpointServicesRestOperations.cs} |   6 +-
 ...vailablePrivateEndpointTypesOperations.cs} |  30 +-
 ...ablePrivateEndpointTypesRestOperations.cs} |   6 +-
 ...ableResourceGroupDelegationsOperations.cs} |  22 +-
 ...ResourceGroupDelegationsRestOperations.cs} |   6 +-
 ...s => AvailableServiceAliasesOperations.cs} |  30 +-
 ... AvailableServiceAliasesRestOperations.cs} |   6 +-
 ....cs => AzureFirewallFqdnTagsOperations.cs} |  22 +-
 ...=> AzureFirewallFqdnTagsRestOperations.cs} |   6 +-
 ...sClient.cs => AzureFirewallsOperations.cs} |  46 +-
 ...ent.cs => AzureFirewallsRestOperations.cs} |   6 +-
 ...stsClient.cs => BastionHostsOperations.cs} |  42 +-
 ...lient.cs => BastionHostsRestOperations.cs} |   6 +-
 ....cs => BgpServiceCommunitiesOperations.cs} |  22 +-
 ...=> BgpServiceCommunitiesRestOperations.cs} |   6 +-
 ...ent.cs => ConnectionMonitorsOperations.cs} |  46 +-
 ...cs => ConnectionMonitorsRestOperations.cs} |   6 +-
 ...ent.cs => DdosCustomPoliciesOperations.cs} |  30 +-
 ...cs => DdosCustomPoliciesRestOperations.cs} |   6 +-
 ...nt.cs => DdosProtectionPlansOperations.cs} |  46 +-
 ...s => DdosProtectionPlansRestOperations.cs} |   6 +-
 ...t.cs => DefaultSecurityRulesOperations.cs} |  26 +-
 ... => DefaultSecurityRulesRestOperations.cs} |   6 +-
 ...ssRouteCircuitAuthorizationsOperations.cs} |  34 +-
 ...uteCircuitAuthorizationsRestOperations.cs} |   6 +-
 ...pressRouteCircuitConnectionsOperations.cs} |  34 +-
 ...sRouteCircuitConnectionsRestOperations.cs} |   6 +-
 ... ExpressRouteCircuitPeeringsOperations.cs} |  34 +-
 ...ressRouteCircuitPeeringsRestOperations.cs} |   6 +-
 ...t.cs => ExpressRouteCircuitsOperations.cs} |  66 +-
 ... => ExpressRouteCircuitsRestOperations.cs} |   6 +-
 ...s => ExpressRouteConnectionsOperations.cs} |  30 +-
 ... ExpressRouteConnectionsRestOperations.cs} |   6 +-
 ...RouteCrossConnectionPeeringsOperations.cs} |  34 +-
 ...eCrossConnectionPeeringsRestOperations.cs} |   6 +-
 ...ExpressRouteCrossConnectionsOperations.cs} |  54 +-
 ...essRouteCrossConnectionsRestOperations.cs} |   6 +-
 ...t.cs => ExpressRouteGatewaysOperations.cs} |  34 +-
 ... => ExpressRouteGatewaysRestOperations.cs} |   6 +-
 ...ient.cs => ExpressRouteLinksOperations.cs} |  26 +-
 ....cs => ExpressRouteLinksRestOperations.cs} |   6 +-
 ...> ExpressRoutePortsLocationsOperations.cs} |  26 +-
 ...pressRoutePortsLocationsRestOperations.cs} |   6 +-
 ...ient.cs => ExpressRoutePortsOperations.cs} |  46 +-
 ....cs => ExpressRoutePortsRestOperations.cs} |   6 +-
 ...ExpressRouteServiceProvidersOperations.cs} |  22 +-
 ...essRouteServiceProvidersRestOperations.cs} |   6 +-
 ...lient.cs => FirewallPoliciesOperations.cs} |  42 +-
 ...t.cs => FirewallPoliciesRestOperations.cs} |   6 +-
 ... => FirewallPolicyRuleGroupsOperations.cs} |  34 +-
 ...FirewallPolicyRuleGroupsRestOperations.cs} |   6 +-
 ...lowLogsClient.cs => FlowLogsOperations.cs} |  34 +-
 ...estClient.cs => FlowLogsRestOperations.cs} |   6 +-
 ...sClient.cs => HubRouteTablesOperations.cs} |  34 +-
 ...ent.cs => HubRouteTablesRestOperations.cs} |   6 +-
 ...HubVirtualNetworkConnectionsOperations.cs} |  26 +-
 ...irtualNetworkConnectionsRestOperations.cs} |   6 +-
 ...Client.cs => InboundNatRulesOperations.cs} |  34 +-
 ...nt.cs => InboundNatRulesRestOperations.cs} |   6 +-
 ...nsClient.cs => IpAllocationsOperations.cs} |  46 +-
 ...ient.cs => IpAllocationsRestOperations.cs} |   6 +-
 ...pGroupsClient.cs => IpGroupsOperations.cs} |  46 +-
 ...estClient.cs => IpGroupsRestOperations.cs} |   6 +-
 ...dBalancerBackendAddressPoolsOperations.cs} |  34 +-
 ...ancerBackendAddressPoolsRestOperations.cs} |   6 +-
 ...ncerFrontendIPConfigurationsOperations.cs} |  26 +-
 ...FrontendIPConfigurationsRestOperations.cs} |   6 +-
 ...adBalancerLoadBalancingRulesOperations.cs} |  26 +-
 ...lancerLoadBalancingRulesRestOperations.cs} |   6 +-
 ...oadBalancerNetworkInterfacesOperations.cs} |  22 +-
 ...alancerNetworkInterfacesRestOperations.cs} |   6 +-
 ...=> LoadBalancerOutboundRulesOperations.cs} |  26 +-
 ...oadBalancerOutboundRulesRestOperations.cs} |   6 +-
 ...ent.cs => LoadBalancerProbesOperations.cs} |  26 +-
 ...cs => LoadBalancerProbesRestOperations.cs} |   6 +-
 ...rsClient.cs => LoadBalancersOperations.cs} |  46 +-
 ...ient.cs => LoadBalancersRestOperations.cs} |   6 +-
 ...t.cs => LocalNetworkGatewaysOperations.cs} |  38 +-
 ... => LocalNetworkGatewaysRestOperations.cs} |   6 +-
 ...waysClient.cs => NatGatewaysOperations.cs} |  46 +-
 ...Client.cs => NatGatewaysRestOperations.cs} |   6 +-
 ...orkInterfaceIPConfigurationsOperations.cs} |  26 +-
 ...nterfaceIPConfigurationsRestOperations.cs} |   6 +-
 ...etworkInterfaceLoadBalancersOperations.cs} |  22 +-
 ...rkInterfaceLoadBalancersRestOperations.cs} |   6 +-
 ...rkInterfaceTapConfigurationsOperations.cs} |  34 +-
 ...terfaceTapConfigurationsRestOperations.cs} |   6 +-
 ...ient.cs => NetworkInterfacesOperations.cs} |  86 +--
 ....cs => NetworkInterfacesRestOperations.cs} |   6 +-
 .../src/Generated/NetworkManagementClient.cs  | 665 +++++-------------
 ...Client.cs => NetworkProfilesOperations.cs} |  46 +-
 ...nt.cs => NetworkProfilesRestOperations.cs} |   6 +-
 ....cs => NetworkSecurityGroupsOperations.cs} |  46 +-
 ...=> NetworkSecurityGroupsRestOperations.cs} |   6 +-
 ... => NetworkVirtualAppliancesOperations.cs} |  46 +-
 ...NetworkVirtualAppliancesRestOperations.cs} |   6 +-
 ...Client.cs => NetworkWatchersOperations.cs} |  86 +--
 ...nt.cs => NetworkWatchersRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  24 +-
 ...sClient.cs => P2SVpnGatewaysOperations.cs} |  62 +-
 ...ent.cs => P2SVpnGatewaysRestOperations.cs} |   6 +-
 ...sClient.cs => PacketCapturesOperations.cs} |  38 +-
 ...ent.cs => PacketCapturesRestOperations.cs} |   6 +-
 ...pressRouteCircuitConnectionsOperations.cs} |  26 +-
 ...sRouteCircuitConnectionsRestOperations.cs} |   6 +-
 ...t.cs => PrivateDnsZoneGroupsOperations.cs} |  34 +-
 ... => PrivateDnsZoneGroupsRestOperations.cs} |   6 +-
 ...lient.cs => PrivateEndpointsOperations.cs} |  42 +-
 ...t.cs => PrivateEndpointsRestOperations.cs} |   6 +-
 ...nt.cs => PrivateLinkServicesOperations.cs} |  86 +--
 ...s => PrivateLinkServicesRestOperations.cs} |   6 +-
 ...ient.cs => PublicIPAddressesOperations.cs} |  66 +-
 ....cs => PublicIPAddressesRestOperations.cs} |   6 +-
 ...lient.cs => PublicIPPrefixesOperations.cs} |  46 +-
 ...t.cs => PublicIPPrefixesRestOperations.cs} |   6 +-
 ...s => ResourceNavigationLinksOperations.cs} |  18 +-
 ... ResourceNavigationLinksRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 ...lient.cs => RouteFilterRulesOperations.cs} |  34 +-
 ...t.cs => RouteFilterRulesRestOperations.cs} |   6 +-
 ...ersClient.cs => RouteFiltersOperations.cs} |  46 +-
 ...lient.cs => RouteFiltersRestOperations.cs} |   6 +-
 ...blesClient.cs => RouteTablesOperations.cs} |  46 +-
 ...Client.cs => RouteTablesRestOperations.cs} |   6 +-
 .../{RoutesClient.cs => RoutesOperations.cs}  |  34 +-
 ...sRestClient.cs => RoutesRestOperations.cs} |   6 +-
 ... => SecurityPartnerProvidersOperations.cs} |  46 +-
 ...SecurityPartnerProvidersRestOperations.cs} |   6 +-
 ...esClient.cs => SecurityRulesOperations.cs} |  34 +-
 ...ient.cs => SecurityRulesRestOperations.cs} |   6 +-
 ...s => ServiceAssociationLinksOperations.cs} |  18 +-
 ... ServiceAssociationLinksRestOperations.cs} |   6 +-
 ...s => ServiceEndpointPoliciesOperations.cs} |  46 +-
 ... ServiceEndpointPoliciesRestOperations.cs} |   6 +-
 ...iceEndpointPolicyDefinitionsOperations.cs} |  34 +-
 ...ndpointPolicyDefinitionsRestOperations.cs} |   6 +-
 ...{ServiceClient.cs => ServiceOperations.cs} |  54 +-
 ...RestClient.cs => ServiceRestOperations.cs} |   6 +-
 ...TagsClient.cs => ServiceTagsOperations.cs} |  18 +-
 ...Client.cs => ServiceTagsRestOperations.cs} |   6 +-
 ...{SubnetsClient.cs => SubnetsOperations.cs} |  42 +-
 ...RestClient.cs => SubnetsRestOperations.cs} |   6 +-
 .../{UsagesClient.cs => UsagesOperations.cs}  |  22 +-
 ...sRestClient.cs => UsagesRestOperations.cs} |   6 +-
 ...s => VirtualHubRouteTableV2SOperations.cs} |  34 +-
 ... VirtualHubRouteTableV2SRestOperations.cs} |   6 +-
 ...HubsClient.cs => VirtualHubsOperations.cs} |  46 +-
 ...Client.cs => VirtualHubsRestOperations.cs} |   6 +-
 ...ualNetworkGatewayConnectionsOperations.cs} |  58 +-
 ...etworkGatewayConnectionsRestOperations.cs} |   6 +-
 ...cs => VirtualNetworkGatewaysOperations.cs} | 110 +--
 ...> VirtualNetworkGatewaysRestOperations.cs} |   6 +-
 ...cs => VirtualNetworkPeeringsOperations.cs} |  34 +-
 ...> VirtualNetworkPeeringsRestOperations.cs} |   6 +-
 ...ent.cs => VirtualNetworkTapsOperations.cs} |  46 +-
 ...cs => VirtualNetworkTapsRestOperations.cs} |   6 +-
 ...Client.cs => VirtualNetworksOperations.cs} |  58 +-
 ...nt.cs => VirtualNetworksRestOperations.cs} |   6 +-
 ....cs => VirtualRouterPeeringsOperations.cs} |  34 +-
 ...=> VirtualRouterPeeringsRestOperations.cs} |   6 +-
 ...sClient.cs => VirtualRoutersOperations.cs} |  42 +-
 ...ent.cs => VirtualRoutersRestOperations.cs} |   6 +-
 ...WansClient.cs => VirtualWansOperations.cs} |  46 +-
 ...Client.cs => VirtualWansRestOperations.cs} |   6 +-
 ...sClient.cs => VpnConnectionsOperations.cs} |  34 +-
 ...ent.cs => VpnConnectionsRestOperations.cs} |   6 +-
 ...waysClient.cs => VpnGatewaysOperations.cs} |  50 +-
 ...Client.cs => VpnGatewaysRestOperations.cs} |   6 +-
 ...ent.cs => VpnLinkConnectionsOperations.cs} |  22 +-
 ...cs => VpnLinkConnectionsRestOperations.cs} |   6 +-
 ...ionsAssociatedWithVirtualWanOperations.cs} |  18 +-
 ...AssociatedWithVirtualWanRestOperations.cs} |   6 +-
 ...s => VpnServerConfigurationsOperations.cs} |  46 +-
 ... VpnServerConfigurationsRestOperations.cs} |   6 +-
 ...cs => VpnSiteLinkConnectionsOperations.cs} |  18 +-
 ...> VpnSiteLinkConnectionsRestOperations.cs} |   6 +-
 ...nksClient.cs => VpnSiteLinksOperations.cs} |  26 +-
 ...lient.cs => VpnSiteLinksRestOperations.cs} |   6 +-
 ....cs => VpnSitesConfigurationOperations.cs} |  18 +-
 ...=> VpnSitesConfigurationRestOperations.cs} |   6 +-
 ...pnSitesClient.cs => VpnSitesOperations.cs} |  46 +-
 ...estClient.cs => VpnSitesRestOperations.cs} |   6 +-
 ...bApplicationFirewallPoliciesOperations.cs} |  42 +-
 ...licationFirewallPoliciesRestOperations.cs} |   6 +-
 ...cs => ApplicationDefinitionsOperations.cs} |  46 +-
 ...> ApplicationDefinitionsRestOperations.cs} |   6 +-
 ...onsClient.cs => ApplicationsOperations.cs} |  62 +-
 ...lient.cs => ApplicationsRestOperations.cs} |   6 +-
 ...onClient.cs => AuthorizationOperations.cs} |  22 +-
 ...ient.cs => AuthorizationRestOperations.cs} |   6 +-
 ...ymentClient.cs => DeploymentOperations.cs} |  74 +-
 ...tClient.cs => DeploymentRestOperations.cs} |   6 +-
 ...ient.cs => DeploymentScriptsOperations.cs} |  54 +-
 ....cs => DeploymentScriptsRestOperations.cs} |   6 +-
 ...entsClient.cs => DeploymentsOperations.cs} | 206 +++---
 ...Client.cs => DeploymentsRestOperations.cs} |   6 +-
 ...eaturesClient.cs => FeaturesOperations.cs} |  42 +-
 ...estClient.cs => FeaturesRestOperations.cs} |   6 +-
 ...Client.cs => ManagementLocksOperations.cs} |  94 +--
 ...nt.cs => ManagementLocksRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  24 +-
 ...ient.cs => PolicyAssignmentsOperations.cs} |  70 +-
 ....cs => PolicyAssignmentsRestOperations.cs} |   6 +-
 ...ient.cs => PolicyDefinitionsOperations.cs} |  66 +-
 ....cs => PolicyDefinitionsRestOperations.cs} |   6 +-
 ...t.cs => PolicySetDefinitionsOperations.cs} |  66 +-
 ... => PolicySetDefinitionsRestOperations.cs} |   6 +-
 ...vidersClient.cs => ProvidersOperations.cs} |  46 +-
 ...stClient.cs => ProvidersRestOperations.cs} |   6 +-
 ...sClient.cs => ResourceGroupsOperations.cs} |  46 +-
 ...ent.cs => ResourceGroupsRestOperations.cs} |   6 +-
 ...ksClient.cs => ResourceLinksOperations.cs} |  42 +-
 ...ient.cs => ResourceLinksRestOperations.cs} |   6 +-
 .../Generated/ResourcesManagementClient.cs    | 140 ++--
 ...ourcesClient.cs => ResourcesOperations.cs} |  78 +-
 ...stClient.cs => ResourcesRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 ...{ServiceClient.cs => ServiceOperations.cs} |  22 +-
 ...RestClient.cs => ServiceRestOperations.cs} |   6 +-
 ...nsClient.cs => SubscriptionsOperations.cs} |  30 +-
 ...ient.cs => SubscriptionsRestOperations.cs} |   6 +-
 .../{TagsClient.cs => TagsOperations.cs}      |  54 +-
 ...agsRestClient.cs => TagsRestOperations.cs} |   6 +-
 ...{TenantsClient.cs => TenantsOperations.cs} |  22 +-
 ...RestClient.cs => TenantsRestOperations.cs} |   6 +-
 ...sClient.cs => BlobContainersOperations.cs} |  70 +-
 ...ent.cs => BlobContainersRestOperations.cs} |   6 +-
 ...cesClient.cs => BlobServicesOperations.cs} |  26 +-
 ...lient.cs => BlobServicesRestOperations.cs} |   6 +-
 ...lient.cs => EncryptionScopesOperations.cs} |  34 +-
 ...t.cs => EncryptionScopesRestOperations.cs} |   6 +-
 ...cesClient.cs => FileServicesOperations.cs} |  26 +-
 ...lient.cs => FileServicesRestOperations.cs} |   6 +-
 ...haresClient.cs => FileSharesOperations.cs} |  42 +-
 ...tClient.cs => FileSharesRestOperations.cs} |   6 +-
 ...ent.cs => ManagementPoliciesOperations.cs} |  26 +-
 ...cs => ManagementPoliciesRestOperations.cs} |   6 +-
 ...=> ObjectReplicationPoliciesOperations.cs} |  30 +-
 ...bjectReplicationPoliciesRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  20 +-
 ...> PrivateEndpointConnectionsOperations.cs} |  30 +-
 ...ivateEndpointConnectionsRestOperations.cs} |   6 +-
 ...t.cs => PrivateLinkResourcesOperations.cs} |  18 +-
 ... => PrivateLinkResourcesRestOperations.cs} |   6 +-
 .../{QueueClient.cs => QueueOperations.cs}    |  38 +-
 ...ueRestClient.cs => QueueRestOperations.cs} |   6 +-
 ...esClient.cs => QueueServicesOperations.cs} |  26 +-
 ...ient.cs => QueueServicesRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 .../{SkusClient.cs => SkusOperations.cs}      |  18 +-
 ...kusRestClient.cs => SkusRestOperations.cs} |   6 +-
 ...Client.cs => StorageAccountsOperations.cs} |  74 +-
 ...nt.cs => StorageAccountsRestOperations.cs} |   6 +-
 .../src/Generated/StorageManagementClient.cs  | 119 +---
 .../{TableClient.cs => TableOperations.cs}    |  38 +-
 ...leRestClient.cs => TableRestOperations.cs} |   6 +-
 ...esClient.cs => TableServicesOperations.cs} |  26 +-
 ...ient.cs => TableServicesRestOperations.cs} |   6 +-
 .../{UsagesClient.cs => UsagesOperations.cs}  |  18 +-
 ...sRestClient.cs => UsagesRestOperations.cs} |   6 +-
 ...onsClient.cs => ApplicationsOperations.cs} |  82 +--
 ...lient.cs => ApplicationsRestOperations.cs} |   6 +-
 ...nt.cs => DeletedApplicationsOperations.cs} |  38 +-
 ...s => DeletedApplicationsRestOperations.cs} |   6 +-
 ...{DomainsClient.cs => DomainsOperations.cs} |  22 +-
 ...RestClient.cs => DomainsRestOperations.cs} |   6 +-
 .../{GroupsClient.cs => GroupsOperations.cs}  |  90 +--
 ...sRestClient.cs => GroupsRestOperations.cs} |   6 +-
 ....cs => OAuth2PermissionGrantOperations.cs} |  38 +-
 ...=> OAuth2PermissionGrantRestOperations.cs} |   6 +-
 ...{ObjectsClient.cs => ObjectsOperations.cs} |  30 +-
 ...RestClient.cs => ObjectsRestOperations.cs} |   6 +-
 .../src/Generated/RbacManagementClient.cs     |  63 +-
 ...ient.cs => ServicePrincipalsOperations.cs} |  70 +-
 ....cs => ServicePrincipalsRestOperations.cs} |   6 +-
 ...serClient.cs => SignedInUserOperations.cs} |  34 +-
 ...lient.cs => SignedInUserRestOperations.cs} |   6 +-
 .../{UsersClient.cs => UsersOperations.cs}    |  50 +-
 ...rsRestClient.cs => UsersRestOperations.cs} |   6 +-
 ...lient.cs => AvailabilitySetsOperations.cs} |  50 +-
 ...t.cs => AvailabilitySetsRestOperations.cs} |   6 +-
 .../src/Generated/ComputeManagementClient.cs  | 210 ++----
 ...ient.cs => ContainerServicesOperations.cs} |  42 +-
 ....cs => ContainerServicesRestOperations.cs} |   6 +-
 ...nt.cs => DedicatedHostGroupsOperations.cs} |  46 +-
 ...s => DedicatedHostGroupsRestOperations.cs} |   6 +-
 ...sClient.cs => DedicatedHostsOperations.cs} |  38 +-
 ...ent.cs => DedicatedHostsRestOperations.cs} |   6 +-
 ...ent.cs => DiskEncryptionSetsOperations.cs} |  46 +-
 ...cs => DiskEncryptionSetsRestOperations.cs} |   6 +-
 .../{DisksClient.cs => DisksOperations.cs}    |  54 +-
 ...ksRestClient.cs => DisksRestOperations.cs} |   6 +-
 ...leriesClient.cs => GalleriesOperations.cs} |  46 +-
 ...stClient.cs => GalleriesRestOperations.cs} |   6 +-
 ...> GalleryApplicationVersionsOperations.cs} |  38 +-
 ...lleryApplicationVersionsRestOperations.cs} |   6 +-
 ...nt.cs => GalleryApplicationsOperations.cs} |  38 +-
 ...s => GalleryApplicationsRestOperations.cs} |   6 +-
 ...t.cs => GalleryImageVersionsOperations.cs} |  38 +-
 ... => GalleryImageVersionsRestOperations.cs} |   6 +-
 ...esClient.cs => GalleryImagesOperations.cs} |  38 +-
 ...ient.cs => GalleryImagesRestOperations.cs} |   6 +-
 .../{ImagesClient.cs => ImagesOperations.cs}  |  46 +-
 ...sRestClient.cs => ImagesRestOperations.cs} |   6 +-
 ...icsClient.cs => LogAnalyticsOperations.cs} |  22 +-
 ...lient.cs => LogAnalyticsRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  20 +-
 ... => ProximityPlacementGroupsOperations.cs} |  46 +-
 ...ProximityPlacementGroupsRestOperations.cs} |   6 +-
 ...kusClient.cs => ResourceSkusOperations.cs} |  22 +-
 ...lient.cs => ResourceSkusRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 ...pshotsClient.cs => SnapshotsOperations.cs} |  54 +-
 ...stClient.cs => SnapshotsRestOperations.cs} |   6 +-
 ...ysClient.cs => SshPublicKeysOperations.cs} |  50 +-
 ...ient.cs => SshPublicKeysRestOperations.cs} |   6 +-
 .../{UsageClient.cs => UsageOperations.cs}    |  22 +-
 ...geRestClient.cs => UsageRestOperations.cs} |   6 +-
 ...irtualMachineExtensionImagesOperations.cs} |  26 +-
 ...alMachineExtensionImagesRestOperations.cs} |   6 +-
 ... => VirtualMachineExtensionsOperations.cs} |  34 +-
 ...VirtualMachineExtensionsRestOperations.cs} |   6 +-
 ...t.cs => VirtualMachineImagesOperations.cs} |  34 +-
 ... => VirtualMachineImagesRestOperations.cs} |   6 +-
 ...=> VirtualMachineRunCommandsOperations.cs} |  26 +-
 ...irtualMachineRunCommandsRestOperations.cs} |   6 +-
 ...ualMachineScaleSetExtensionsOperations.cs} |  38 +-
 ...achineScaleSetExtensionsRestOperations.cs} |   6 +-
 ...chineScaleSetRollingUpgradesOperations.cs} |  30 +-
 ...eScaleSetRollingUpgradesRestOperations.cs} |   6 +-
 ...lMachineScaleSetVMExtensionsOperations.cs} |  34 +-
 ...hineScaleSetVMExtensionsRestOperations.cs} |   6 +-
 ...=> VirtualMachineScaleSetVMsOperations.cs} |  78 +-
 ...irtualMachineScaleSetVMsRestOperations.cs} |   6 +-
 ...s => VirtualMachineScaleSetsOperations.cs} | 118 ++--
 ... VirtualMachineScaleSetsRestOperations.cs} |   6 +-
 ...nt.cs => VirtualMachineSizesOperations.cs} |  18 +-
 ...s => VirtualMachineSizesRestOperations.cs} |   6 +-
 ...Client.cs => VirtualMachinesOperations.cs} | 114 +--
 ...nt.cs => VirtualMachinesRestOperations.cs} |   6 +-
 ...nt.cs => ApplicationGatewaysOperations.cs} |  94 +--
 ...s => ApplicationGatewaysRestOperations.cs} |   6 +-
 ...=> ApplicationSecurityGroupsOperations.cs} |  46 +-
 ...pplicationSecurityGroupsRestOperations.cs} |   6 +-
 ...t.cs => AvailableDelegationsOperations.cs} |  22 +-
 ... => AvailableDelegationsRestOperations.cs} |   6 +-
 ...=> AvailableEndpointServicesOperations.cs} |  22 +-
 ...vailableEndpointServicesRestOperations.cs} |   6 +-
 ...vailablePrivateEndpointTypesOperations.cs} |  30 +-
 ...ablePrivateEndpointTypesRestOperations.cs} |   6 +-
 ...ableResourceGroupDelegationsOperations.cs} |  22 +-
 ...ResourceGroupDelegationsRestOperations.cs} |   6 +-
 ...s => AvailableServiceAliasesOperations.cs} |  30 +-
 ... AvailableServiceAliasesRestOperations.cs} |   6 +-
 ....cs => AzureFirewallFqdnTagsOperations.cs} |  22 +-
 ...=> AzureFirewallFqdnTagsRestOperations.cs} |   6 +-
 ...sClient.cs => AzureFirewallsOperations.cs} |  46 +-
 ...ent.cs => AzureFirewallsRestOperations.cs} |   6 +-
 ...stsClient.cs => BastionHostsOperations.cs} |  42 +-
 ...lient.cs => BastionHostsRestOperations.cs} |   6 +-
 ....cs => BgpServiceCommunitiesOperations.cs} |  22 +-
 ...=> BgpServiceCommunitiesRestOperations.cs} |   6 +-
 ...ent.cs => ConnectionMonitorsOperations.cs} |  46 +-
 ...cs => ConnectionMonitorsRestOperations.cs} |   6 +-
 ...ent.cs => DdosCustomPoliciesOperations.cs} |  30 +-
 ...cs => DdosCustomPoliciesRestOperations.cs} |   6 +-
 ...nt.cs => DdosProtectionPlansOperations.cs} |  46 +-
 ...s => DdosProtectionPlansRestOperations.cs} |   6 +-
 ...t.cs => DefaultSecurityRulesOperations.cs} |  26 +-
 ... => DefaultSecurityRulesRestOperations.cs} |   6 +-
 ...ssRouteCircuitAuthorizationsOperations.cs} |  34 +-
 ...uteCircuitAuthorizationsRestOperations.cs} |   6 +-
 ...pressRouteCircuitConnectionsOperations.cs} |  34 +-
 ...sRouteCircuitConnectionsRestOperations.cs} |   6 +-
 ... ExpressRouteCircuitPeeringsOperations.cs} |  34 +-
 ...ressRouteCircuitPeeringsRestOperations.cs} |   6 +-
 ...t.cs => ExpressRouteCircuitsOperations.cs} |  66 +-
 ... => ExpressRouteCircuitsRestOperations.cs} |   6 +-
 ...s => ExpressRouteConnectionsOperations.cs} |  30 +-
 ... ExpressRouteConnectionsRestOperations.cs} |   6 +-
 ...RouteCrossConnectionPeeringsOperations.cs} |  34 +-
 ...eCrossConnectionPeeringsRestOperations.cs} |   6 +-
 ...ExpressRouteCrossConnectionsOperations.cs} |  54 +-
 ...essRouteCrossConnectionsRestOperations.cs} |   6 +-
 ...t.cs => ExpressRouteGatewaysOperations.cs} |  34 +-
 ... => ExpressRouteGatewaysRestOperations.cs} |   6 +-
 ...ient.cs => ExpressRouteLinksOperations.cs} |  26 +-
 ....cs => ExpressRouteLinksRestOperations.cs} |   6 +-
 ...> ExpressRoutePortsLocationsOperations.cs} |  26 +-
 ...pressRoutePortsLocationsRestOperations.cs} |   6 +-
 ...ient.cs => ExpressRoutePortsOperations.cs} |  46 +-
 ....cs => ExpressRoutePortsRestOperations.cs} |   6 +-
 ...ExpressRouteServiceProvidersOperations.cs} |  22 +-
 ...essRouteServiceProvidersRestOperations.cs} |   6 +-
 ...lient.cs => FirewallPoliciesOperations.cs} |  42 +-
 ...t.cs => FirewallPoliciesRestOperations.cs} |   6 +-
 ... => FirewallPolicyRuleGroupsOperations.cs} |  34 +-
 ...FirewallPolicyRuleGroupsRestOperations.cs} |   6 +-
 ...lowLogsClient.cs => FlowLogsOperations.cs} |  34 +-
 ...estClient.cs => FlowLogsRestOperations.cs} |   6 +-
 ...sClient.cs => HubRouteTablesOperations.cs} |  34 +-
 ...ent.cs => HubRouteTablesRestOperations.cs} |   6 +-
 ...HubVirtualNetworkConnectionsOperations.cs} |  26 +-
 ...irtualNetworkConnectionsRestOperations.cs} |   6 +-
 ...Client.cs => InboundNatRulesOperations.cs} |  34 +-
 ...nt.cs => InboundNatRulesRestOperations.cs} |   6 +-
 ...nsClient.cs => IpAllocationsOperations.cs} |  46 +-
 ...ient.cs => IpAllocationsRestOperations.cs} |   6 +-
 ...pGroupsClient.cs => IpGroupsOperations.cs} |  46 +-
 ...estClient.cs => IpGroupsRestOperations.cs} |   6 +-
 ...dBalancerBackendAddressPoolsOperations.cs} |  34 +-
 ...ancerBackendAddressPoolsRestOperations.cs} |   6 +-
 ...ncerFrontendIPConfigurationsOperations.cs} |  26 +-
 ...FrontendIPConfigurationsRestOperations.cs} |   6 +-
 ...adBalancerLoadBalancingRulesOperations.cs} |  26 +-
 ...lancerLoadBalancingRulesRestOperations.cs} |   6 +-
 ...oadBalancerNetworkInterfacesOperations.cs} |  22 +-
 ...alancerNetworkInterfacesRestOperations.cs} |   6 +-
 ...=> LoadBalancerOutboundRulesOperations.cs} |  26 +-
 ...oadBalancerOutboundRulesRestOperations.cs} |   6 +-
 ...ent.cs => LoadBalancerProbesOperations.cs} |  26 +-
 ...cs => LoadBalancerProbesRestOperations.cs} |   6 +-
 ...rsClient.cs => LoadBalancersOperations.cs} |  46 +-
 ...ient.cs => LoadBalancersRestOperations.cs} |   6 +-
 ...t.cs => LocalNetworkGatewaysOperations.cs} |  38 +-
 ... => LocalNetworkGatewaysRestOperations.cs} |   6 +-
 ...waysClient.cs => NatGatewaysOperations.cs} |  46 +-
 ...Client.cs => NatGatewaysRestOperations.cs} |   6 +-
 ...orkInterfaceIPConfigurationsOperations.cs} |  26 +-
 ...nterfaceIPConfigurationsRestOperations.cs} |   6 +-
 ...etworkInterfaceLoadBalancersOperations.cs} |  22 +-
 ...rkInterfaceLoadBalancersRestOperations.cs} |   6 +-
 ...rkInterfaceTapConfigurationsOperations.cs} |  34 +-
 ...terfaceTapConfigurationsRestOperations.cs} |   6 +-
 ...ient.cs => NetworkInterfacesOperations.cs} |  86 +--
 ....cs => NetworkInterfacesRestOperations.cs} |   6 +-
 .../src/Generated/NetworkManagementClient.cs  | 665 +++++-------------
 ...Client.cs => NetworkProfilesOperations.cs} |  46 +-
 ...nt.cs => NetworkProfilesRestOperations.cs} |   6 +-
 ....cs => NetworkSecurityGroupsOperations.cs} |  46 +-
 ...=> NetworkSecurityGroupsRestOperations.cs} |   6 +-
 ... => NetworkVirtualAppliancesOperations.cs} |  46 +-
 ...NetworkVirtualAppliancesRestOperations.cs} |   6 +-
 ...Client.cs => NetworkWatchersOperations.cs} |  86 +--
 ...nt.cs => NetworkWatchersRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  24 +-
 ...sClient.cs => P2SVpnGatewaysOperations.cs} |  62 +-
 ...ent.cs => P2SVpnGatewaysRestOperations.cs} |   6 +-
 ...sClient.cs => PacketCapturesOperations.cs} |  38 +-
 ...ent.cs => PacketCapturesRestOperations.cs} |   6 +-
 ...pressRouteCircuitConnectionsOperations.cs} |  26 +-
 ...sRouteCircuitConnectionsRestOperations.cs} |   6 +-
 ...t.cs => PrivateDnsZoneGroupsOperations.cs} |  34 +-
 ... => PrivateDnsZoneGroupsRestOperations.cs} |   6 +-
 ...lient.cs => PrivateEndpointsOperations.cs} |  42 +-
 ...t.cs => PrivateEndpointsRestOperations.cs} |   6 +-
 ...nt.cs => PrivateLinkServicesOperations.cs} |  86 +--
 ...s => PrivateLinkServicesRestOperations.cs} |   6 +-
 ...ient.cs => PublicIPAddressesOperations.cs} |  66 +-
 ....cs => PublicIPAddressesRestOperations.cs} |   6 +-
 ...lient.cs => PublicIPPrefixesOperations.cs} |  46 +-
 ...t.cs => PublicIPPrefixesRestOperations.cs} |   6 +-
 ...s => ResourceNavigationLinksOperations.cs} |  18 +-
 ... ResourceNavigationLinksRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 ...lient.cs => RouteFilterRulesOperations.cs} |  34 +-
 ...t.cs => RouteFilterRulesRestOperations.cs} |   6 +-
 ...ersClient.cs => RouteFiltersOperations.cs} |  46 +-
 ...lient.cs => RouteFiltersRestOperations.cs} |   6 +-
 ...blesClient.cs => RouteTablesOperations.cs} |  46 +-
 ...Client.cs => RouteTablesRestOperations.cs} |   6 +-
 .../{RoutesClient.cs => RoutesOperations.cs}  |  34 +-
 ...sRestClient.cs => RoutesRestOperations.cs} |   6 +-
 ... => SecurityPartnerProvidersOperations.cs} |  46 +-
 ...SecurityPartnerProvidersRestOperations.cs} |   6 +-
 ...esClient.cs => SecurityRulesOperations.cs} |  34 +-
 ...ient.cs => SecurityRulesRestOperations.cs} |   6 +-
 ...s => ServiceAssociationLinksOperations.cs} |  18 +-
 ... ServiceAssociationLinksRestOperations.cs} |   6 +-
 ...s => ServiceEndpointPoliciesOperations.cs} |  46 +-
 ... ServiceEndpointPoliciesRestOperations.cs} |   6 +-
 ...iceEndpointPolicyDefinitionsOperations.cs} |  34 +-
 ...ndpointPolicyDefinitionsRestOperations.cs} |   6 +-
 ...{ServiceClient.cs => ServiceOperations.cs} |  54 +-
 ...RestClient.cs => ServiceRestOperations.cs} |   6 +-
 ...TagsClient.cs => ServiceTagsOperations.cs} |  18 +-
 ...Client.cs => ServiceTagsRestOperations.cs} |   6 +-
 ...{SubnetsClient.cs => SubnetsOperations.cs} |  42 +-
 ...RestClient.cs => SubnetsRestOperations.cs} |   6 +-
 .../{UsagesClient.cs => UsagesOperations.cs}  |  22 +-
 ...sRestClient.cs => UsagesRestOperations.cs} |   6 +-
 ...s => VirtualHubRouteTableV2SOperations.cs} |  34 +-
 ... VirtualHubRouteTableV2SRestOperations.cs} |   6 +-
 ...HubsClient.cs => VirtualHubsOperations.cs} |  46 +-
 ...Client.cs => VirtualHubsRestOperations.cs} |   6 +-
 ...ualNetworkGatewayConnectionsOperations.cs} |  58 +-
 ...etworkGatewayConnectionsRestOperations.cs} |   6 +-
 ...cs => VirtualNetworkGatewaysOperations.cs} | 110 +--
 ...> VirtualNetworkGatewaysRestOperations.cs} |   6 +-
 ...cs => VirtualNetworkPeeringsOperations.cs} |  34 +-
 ...> VirtualNetworkPeeringsRestOperations.cs} |   6 +-
 ...ent.cs => VirtualNetworkTapsOperations.cs} |  46 +-
 ...cs => VirtualNetworkTapsRestOperations.cs} |   6 +-
 ...Client.cs => VirtualNetworksOperations.cs} |  58 +-
 ...nt.cs => VirtualNetworksRestOperations.cs} |   6 +-
 ....cs => VirtualRouterPeeringsOperations.cs} |  34 +-
 ...=> VirtualRouterPeeringsRestOperations.cs} |   6 +-
 ...sClient.cs => VirtualRoutersOperations.cs} |  42 +-
 ...ent.cs => VirtualRoutersRestOperations.cs} |   6 +-
 ...WansClient.cs => VirtualWansOperations.cs} |  46 +-
 ...Client.cs => VirtualWansRestOperations.cs} |   6 +-
 ...sClient.cs => VpnConnectionsOperations.cs} |  34 +-
 ...ent.cs => VpnConnectionsRestOperations.cs} |   6 +-
 ...waysClient.cs => VpnGatewaysOperations.cs} |  50 +-
 ...Client.cs => VpnGatewaysRestOperations.cs} |   6 +-
 ...ent.cs => VpnLinkConnectionsOperations.cs} |  22 +-
 ...cs => VpnLinkConnectionsRestOperations.cs} |   6 +-
 ...ionsAssociatedWithVirtualWanOperations.cs} |  18 +-
 ...AssociatedWithVirtualWanRestOperations.cs} |   6 +-
 ...s => VpnServerConfigurationsOperations.cs} |  46 +-
 ... VpnServerConfigurationsRestOperations.cs} |   6 +-
 ...cs => VpnSiteLinkConnectionsOperations.cs} |  18 +-
 ...> VpnSiteLinkConnectionsRestOperations.cs} |   6 +-
 ...nksClient.cs => VpnSiteLinksOperations.cs} |  26 +-
 ...lient.cs => VpnSiteLinksRestOperations.cs} |   6 +-
 ....cs => VpnSitesConfigurationOperations.cs} |  18 +-
 ...=> VpnSitesConfigurationRestOperations.cs} |   6 +-
 ...pnSitesClient.cs => VpnSitesOperations.cs} |  46 +-
 ...estClient.cs => VpnSitesRestOperations.cs} |   6 +-
 ...bApplicationFirewallPoliciesOperations.cs} |  42 +-
 ...licationFirewallPoliciesRestOperations.cs} |   6 +-
 ...ymentClient.cs => DeploymentOperations.cs} |  26 +-
 ...tClient.cs => DeploymentRestOperations.cs} |   6 +-
 ...entsClient.cs => DeploymentsOperations.cs} |  54 +-
 ...Client.cs => DeploymentsRestOperations.cs} |   6 +-
 ...vidersClient.cs => ProvidersOperations.cs} |  34 +-
 ...stClient.cs => ProvidersRestOperations.cs} |   6 +-
 ...sClient.cs => ResourceGroupsOperations.cs} |  46 +-
 ...ent.cs => ResourceGroupsRestOperations.cs} |   6 +-
 .../Generated/ResourcesManagementClient.cs    |  42 +-
 ...ourcesClient.cs => ResourcesOperations.cs} |  78 +-
 ...stClient.cs => ResourcesRestOperations.cs} |   6 +-
 .../{TagsClient.cs => TagsOperations.cs}      |  38 +-
 ...agsRestClient.cs => TagsRestOperations.cs} |   6 +-
 ...sClient.cs => BlobContainersOperations.cs} |  70 +-
 ...ent.cs => BlobContainersRestOperations.cs} |   6 +-
 ...cesClient.cs => BlobServicesOperations.cs} |  26 +-
 ...lient.cs => BlobServicesRestOperations.cs} |   6 +-
 ...lient.cs => EncryptionScopesOperations.cs} |  34 +-
 ...t.cs => EncryptionScopesRestOperations.cs} |   6 +-
 ...cesClient.cs => FileServicesOperations.cs} |  26 +-
 ...lient.cs => FileServicesRestOperations.cs} |   6 +-
 ...haresClient.cs => FileSharesOperations.cs} |  42 +-
 ...tClient.cs => FileSharesRestOperations.cs} |   6 +-
 ...ent.cs => ManagementPoliciesOperations.cs} |  26 +-
 ...cs => ManagementPoliciesRestOperations.cs} |   6 +-
 ...=> ObjectReplicationPoliciesOperations.cs} |  30 +-
 ...bjectReplicationPoliciesRestOperations.cs} |   6 +-
 .../{OperationsClient.cs => Operations.cs}    |  20 +-
 ...> PrivateEndpointConnectionsOperations.cs} |  30 +-
 ...ivateEndpointConnectionsRestOperations.cs} |   6 +-
 ...t.cs => PrivateLinkResourcesOperations.cs} |  18 +-
 ... => PrivateLinkResourcesRestOperations.cs} |   6 +-
 .../{QueueClient.cs => QueueOperations.cs}    |  38 +-
 ...ueRestClient.cs => QueueRestOperations.cs} |   6 +-
 ...esClient.cs => QueueServicesOperations.cs} |  26 +-
 ...ient.cs => QueueServicesRestOperations.cs} |   6 +-
 ...rationsRestClient.cs => RestOperations.cs} |   6 +-
 .../{SkusClient.cs => SkusOperations.cs}      |  18 +-
 ...kusRestClient.cs => SkusRestOperations.cs} |   6 +-
 ...Client.cs => StorageAccountsOperations.cs} |  74 +-
 ...nt.cs => StorageAccountsRestOperations.cs} |   6 +-
 .../src/Generated/StorageManagementClient.cs  | 119 +---
 .../{TableClient.cs => TableOperations.cs}    |  38 +-
 ...leRestClient.cs => TableRestOperations.cs} |   6 +-
 ...esClient.cs => TableServicesOperations.cs} |  26 +-
 ...ient.cs => TableServicesRestOperations.cs} |   6 +-
 .../{UsagesClient.cs => UsagesOperations.cs}  |  18 +-
 ...sRestClient.cs => UsagesRestOperations.cs} |   6 +-
 683 files changed, 8546 insertions(+), 9550 deletions(-)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{ConfigurationStoresClient.cs => ConfigurationStoresOperations.cs} (95%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{ConfigurationStoresRestClient.cs => ConfigurationStoresRestOperations.cs} (99%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{OperationsClient.cs => Operations.cs} (88%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{PrivateEndpointConnectionsClient.cs => PrivateEndpointConnectionsOperations.cs} (93%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{PrivateEndpointConnectionsRestClient.cs => PrivateEndpointConnectionsRestOperations.cs} (98%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{PrivateLinkResourcesClient.cs => PrivateLinkResourcesOperations.cs} (90%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{PrivateLinkResourcesRestClient.cs => PrivateLinkResourcesRestOperations.cs} (98%)
 rename sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (97%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{AvailabilitySetsClient.cs => AvailabilitySetsOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{AvailabilitySetsRestClient.cs => AvailabilitySetsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ContainerServicesClient.cs => ContainerServicesOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ContainerServicesRestClient.cs => ContainerServicesRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DedicatedHostGroupsClient.cs => DedicatedHostGroupsOperations.cs} (92%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DedicatedHostGroupsRestClient.cs => DedicatedHostGroupsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DedicatedHostsClient.cs => DedicatedHostsOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DedicatedHostsRestClient.cs => DedicatedHostsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DiskEncryptionSetsClient.cs => DiskEncryptionSetsOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DiskEncryptionSetsRestClient.cs => DiskEncryptionSetsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DisksClient.cs => DisksOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{DisksRestClient.cs => DisksRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleriesClient.cs => GalleriesOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleriesRestClient.cs => GalleriesRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryApplicationVersionsClient.cs => GalleryApplicationVersionsOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryApplicationVersionsRestClient.cs => GalleryApplicationVersionsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryApplicationsClient.cs => GalleryApplicationsOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryApplicationsRestClient.cs => GalleryApplicationsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryImageVersionsClient.cs => GalleryImageVersionsOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryImageVersionsRestClient.cs => GalleryImageVersionsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryImagesClient.cs => GalleryImagesOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{GalleryImagesRestClient.cs => GalleryImagesRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ImagesClient.cs => ImagesOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ImagesRestClient.cs => ImagesRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{LogAnalyticsClient.cs => LogAnalyticsOperations.cs} (91%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{LogAnalyticsRestClient.cs => LogAnalyticsRestOperations.cs} (97%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{OperationsClient.cs => Operations.cs} (81%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ProximityPlacementGroupsClient.cs => ProximityPlacementGroupsOperations.cs} (92%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ProximityPlacementGroupsRestClient.cs => ProximityPlacementGroupsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ResourceSkusClient.cs => ResourceSkusOperations.cs} (88%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{ResourceSkusRestClient.cs => ResourceSkusRestOperations.cs} (97%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{SnapshotsClient.cs => SnapshotsOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{SnapshotsRestClient.cs => SnapshotsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{SshPublicKeysClient.cs => SshPublicKeysOperations.cs} (93%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{SshPublicKeysRestClient.cs => SshPublicKeysRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{UsageClient.cs => UsageOperations.cs} (88%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{UsageRestClient.cs => UsageRestOperations.cs} (97%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineExtensionImagesClient.cs => VirtualMachineExtensionImagesOperations.cs} (89%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineExtensionImagesRestClient.cs => VirtualMachineExtensionImagesRestOperations.cs} (98%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineExtensionsClient.cs => VirtualMachineExtensionsOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineExtensionsRestClient.cs => VirtualMachineExtensionsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineImagesClient.cs => VirtualMachineImagesOperations.cs} (92%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineImagesRestClient.cs => VirtualMachineImagesRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineRunCommandsClient.cs => VirtualMachineRunCommandsOperations.cs} (89%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineRunCommandsRestClient.cs => VirtualMachineRunCommandsRestOperations.cs} (98%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetExtensionsClient.cs => VirtualMachineScaleSetExtensionsOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetExtensionsRestClient.cs => VirtualMachineScaleSetExtensionsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetRollingUpgradesClient.cs => VirtualMachineScaleSetRollingUpgradesOperations.cs} (91%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetRollingUpgradesRestClient.cs => VirtualMachineScaleSetRollingUpgradesRestOperations.cs} (98%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetVMExtensionsClient.cs => VirtualMachineScaleSetVMExtensionsOperations.cs} (94%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetVMExtensionsRestClient.cs => VirtualMachineScaleSetVMExtensionsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetVMsClient.cs => VirtualMachineScaleSetVMsOperations.cs} (96%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetVMsRestClient.cs => VirtualMachineScaleSetVMsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetsClient.cs => VirtualMachineScaleSetsOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineScaleSetsRestClient.cs => VirtualMachineScaleSetsRestOperations.cs} (99%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineSizesClient.cs => VirtualMachineSizesOperations.cs} (86%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachineSizesRestClient.cs => VirtualMachineSizesRestOperations.cs} (95%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachinesClient.cs => VirtualMachinesOperations.cs} (96%)
 rename sdk/compute/Azure.ResourceManager.Compute/src/Generated/{VirtualMachinesRestClient.cs => VirtualMachinesRestOperations.cs} (99%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{ClustersClient.cs => ClustersOperations.cs} (94%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{ClustersRestClient.cs => ClustersRestOperations.cs} (99%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{ConfigurationClient.cs => ConfigurationOperations.cs} (90%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{ConfigurationRestClient.cs => ConfigurationRestOperations.cs} (98%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{ConsumerGroupsClient.cs => ConsumerGroupsOperations.cs} (94%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{ConsumerGroupsRestClient.cs => ConsumerGroupsRestOperations.cs} (99%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{DisasterRecoveryConfigsClient.cs => DisasterRecoveryConfigsOperations.cs} (94%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{DisasterRecoveryConfigsRestClient.cs => DisasterRecoveryConfigsRestOperations.cs} (99%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{EventHubsClient.cs => EventHubsOperations.cs} (95%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{EventHubsRestClient.cs => EventHubsRestOperations.cs} (99%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{NamespacesClient.cs => NamespacesOperations.cs} (95%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{NamespacesRestClient.cs => NamespacesRestOperations.cs} (99%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{OperationsClient.cs => Operations.cs} (85%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{RegionsClient.cs => RegionsOperations.cs} (87%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{RegionsRestClient.cs => RegionsRestOperations.cs} (97%)
 rename sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (96%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{OperationsClient.cs => Operations.cs} (84%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{PrivateEndpointConnectionsClient.cs => PrivateEndpointConnectionsOperations.cs} (91%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{PrivateEndpointConnectionsRestClient.cs => PrivateEndpointConnectionsRestOperations.cs} (98%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{PrivateLinkResourcesClient.cs => PrivateLinkResourcesOperations.cs} (82%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{PrivateLinkResourcesRestClient.cs => PrivateLinkResourcesRestOperations.cs} (95%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (96%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{VaultsClient.cs => VaultsOperations.cs} (95%)
 rename sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/{VaultsRestClient.cs => VaultsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ApplicationGatewaysClient.cs => ApplicationGatewaysOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ApplicationGatewaysRestClient.cs => ApplicationGatewaysRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ApplicationSecurityGroupsClient.cs => ApplicationSecurityGroupsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ApplicationSecurityGroupsRestClient.cs => ApplicationSecurityGroupsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableDelegationsClient.cs => AvailableDelegationsOperations.cs} (88%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableDelegationsRestClient.cs => AvailableDelegationsRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableEndpointServicesClient.cs => AvailableEndpointServicesOperations.cs} (87%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableEndpointServicesRestClient.cs => AvailableEndpointServicesRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailablePrivateEndpointTypesClient.cs => AvailablePrivateEndpointTypesOperations.cs} (90%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailablePrivateEndpointTypesRestClient.cs => AvailablePrivateEndpointTypesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableResourceGroupDelegationsClient.cs => AvailableResourceGroupDelegationsOperations.cs} (88%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableResourceGroupDelegationsRestClient.cs => AvailableResourceGroupDelegationsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableServiceAliasesClient.cs => AvailableServiceAliasesOperations.cs} (90%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AvailableServiceAliasesRestClient.cs => AvailableServiceAliasesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AzureFirewallFqdnTagsClient.cs => AzureFirewallFqdnTagsOperations.cs} (86%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AzureFirewallFqdnTagsRestClient.cs => AzureFirewallFqdnTagsRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AzureFirewallsClient.cs => AzureFirewallsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{AzureFirewallsRestClient.cs => AzureFirewallsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{BastionHostsClient.cs => BastionHostsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{BastionHostsRestClient.cs => BastionHostsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{BgpServiceCommunitiesClient.cs => BgpServiceCommunitiesOperations.cs} (86%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{BgpServiceCommunitiesRestClient.cs => BgpServiceCommunitiesRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ConnectionMonitorsClient.cs => ConnectionMonitorsOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ConnectionMonitorsRestClient.cs => ConnectionMonitorsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{DdosCustomPoliciesClient.cs => DdosCustomPoliciesOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{DdosCustomPoliciesRestClient.cs => DdosCustomPoliciesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{DdosProtectionPlansClient.cs => DdosProtectionPlansOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{DdosProtectionPlansRestClient.cs => DdosProtectionPlansRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{DefaultSecurityRulesClient.cs => DefaultSecurityRulesOperations.cs} (91%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{DefaultSecurityRulesRestClient.cs => DefaultSecurityRulesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitAuthorizationsClient.cs => ExpressRouteCircuitAuthorizationsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitAuthorizationsRestClient.cs => ExpressRouteCircuitAuthorizationsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitConnectionsClient.cs => ExpressRouteCircuitConnectionsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitConnectionsRestClient.cs => ExpressRouteCircuitConnectionsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitPeeringsClient.cs => ExpressRouteCircuitPeeringsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitPeeringsRestClient.cs => ExpressRouteCircuitPeeringsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitsClient.cs => ExpressRouteCircuitsOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCircuitsRestClient.cs => ExpressRouteCircuitsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteConnectionsClient.cs => ExpressRouteConnectionsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteConnectionsRestClient.cs => ExpressRouteConnectionsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCrossConnectionPeeringsClient.cs => ExpressRouteCrossConnectionPeeringsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCrossConnectionPeeringsRestClient.cs => ExpressRouteCrossConnectionPeeringsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCrossConnectionsClient.cs => ExpressRouteCrossConnectionsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteCrossConnectionsRestClient.cs => ExpressRouteCrossConnectionsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteGatewaysClient.cs => ExpressRouteGatewaysOperations.cs} (92%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteGatewaysRestClient.cs => ExpressRouteGatewaysRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteLinksClient.cs => ExpressRouteLinksOperations.cs} (91%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteLinksRestClient.cs => ExpressRouteLinksRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRoutePortsLocationsClient.cs => ExpressRoutePortsLocationsOperations.cs} (88%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRoutePortsLocationsRestClient.cs => ExpressRoutePortsLocationsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRoutePortsClient.cs => ExpressRoutePortsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRoutePortsRestClient.cs => ExpressRoutePortsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteServiceProvidersClient.cs => ExpressRouteServiceProvidersOperations.cs} (85%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ExpressRouteServiceProvidersRestClient.cs => ExpressRouteServiceProvidersRestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{FirewallPoliciesClient.cs => FirewallPoliciesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{FirewallPoliciesRestClient.cs => FirewallPoliciesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{FirewallPolicyRuleGroupsClient.cs => FirewallPolicyRuleGroupsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{FirewallPolicyRuleGroupsRestClient.cs => FirewallPolicyRuleGroupsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{FlowLogsClient.cs => FlowLogsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{FlowLogsRestClient.cs => FlowLogsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{HubRouteTablesClient.cs => HubRouteTablesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{HubRouteTablesRestClient.cs => HubRouteTablesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{HubVirtualNetworkConnectionsClient.cs => HubVirtualNetworkConnectionsOperations.cs} (90%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{HubVirtualNetworkConnectionsRestClient.cs => HubVirtualNetworkConnectionsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{InboundNatRulesClient.cs => InboundNatRulesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{InboundNatRulesRestClient.cs => InboundNatRulesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{IpAllocationsClient.cs => IpAllocationsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{IpAllocationsRestClient.cs => IpAllocationsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{IpGroupsClient.cs => IpGroupsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{IpGroupsRestClient.cs => IpGroupsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerBackendAddressPoolsClient.cs => LoadBalancerBackendAddressPoolsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerBackendAddressPoolsRestClient.cs => LoadBalancerBackendAddressPoolsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerFrontendIPConfigurationsClient.cs => LoadBalancerFrontendIPConfigurationsOperations.cs} (89%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerFrontendIPConfigurationsRestClient.cs => LoadBalancerFrontendIPConfigurationsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerLoadBalancingRulesClient.cs => LoadBalancerLoadBalancingRulesOperations.cs} (89%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerLoadBalancingRulesRestClient.cs => LoadBalancerLoadBalancingRulesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerNetworkInterfacesClient.cs => LoadBalancerNetworkInterfacesOperations.cs} (87%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerNetworkInterfacesRestClient.cs => LoadBalancerNetworkInterfacesRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerOutboundRulesClient.cs => LoadBalancerOutboundRulesOperations.cs} (90%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerOutboundRulesRestClient.cs => LoadBalancerOutboundRulesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerProbesClient.cs => LoadBalancerProbesOperations.cs} (91%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancerProbesRestClient.cs => LoadBalancerProbesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancersClient.cs => LoadBalancersOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LoadBalancersRestClient.cs => LoadBalancersRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LocalNetworkGatewaysClient.cs => LocalNetworkGatewaysOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{LocalNetworkGatewaysRestClient.cs => LocalNetworkGatewaysRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NatGatewaysClient.cs => NatGatewaysOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NatGatewaysRestClient.cs => NatGatewaysRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfaceIPConfigurationsClient.cs => NetworkInterfaceIPConfigurationsOperations.cs} (90%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfaceIPConfigurationsRestClient.cs => NetworkInterfaceIPConfigurationsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfaceLoadBalancersClient.cs => NetworkInterfaceLoadBalancersOperations.cs} (87%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfaceLoadBalancersRestClient.cs => NetworkInterfaceLoadBalancersRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfaceTapConfigurationsClient.cs => NetworkInterfaceTapConfigurationsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfaceTapConfigurationsRestClient.cs => NetworkInterfaceTapConfigurationsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfacesClient.cs => NetworkInterfacesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkInterfacesRestClient.cs => NetworkInterfacesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkProfilesClient.cs => NetworkProfilesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkProfilesRestClient.cs => NetworkProfilesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkSecurityGroupsClient.cs => NetworkSecurityGroupsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkSecurityGroupsRestClient.cs => NetworkSecurityGroupsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkVirtualAppliancesClient.cs => NetworkVirtualAppliancesOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkVirtualAppliancesRestClient.cs => NetworkVirtualAppliancesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkWatchersClient.cs => NetworkWatchersOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{NetworkWatchersRestClient.cs => NetworkWatchersRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{OperationsClient.cs => Operations.cs} (85%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{P2SVpnGatewaysClient.cs => P2SVpnGatewaysOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{P2SVpnGatewaysRestClient.cs => P2SVpnGatewaysRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PacketCapturesClient.cs => PacketCapturesOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PacketCapturesRestClient.cs => PacketCapturesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PeerExpressRouteCircuitConnectionsClient.cs => PeerExpressRouteCircuitConnectionsOperations.cs} (90%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PeerExpressRouteCircuitConnectionsRestClient.cs => PeerExpressRouteCircuitConnectionsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PrivateDnsZoneGroupsClient.cs => PrivateDnsZoneGroupsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PrivateDnsZoneGroupsRestClient.cs => PrivateDnsZoneGroupsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PrivateEndpointsClient.cs => PrivateEndpointsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PrivateEndpointsRestClient.cs => PrivateEndpointsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PrivateLinkServicesClient.cs => PrivateLinkServicesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PrivateLinkServicesRestClient.cs => PrivateLinkServicesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PublicIPAddressesClient.cs => PublicIPAddressesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PublicIPAddressesRestClient.cs => PublicIPAddressesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PublicIPPrefixesClient.cs => PublicIPPrefixesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{PublicIPPrefixesRestClient.cs => PublicIPPrefixesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ResourceNavigationLinksClient.cs => ResourceNavigationLinksOperations.cs} (84%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ResourceNavigationLinksRestClient.cs => ResourceNavigationLinksRestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RouteFilterRulesClient.cs => RouteFilterRulesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RouteFilterRulesRestClient.cs => RouteFilterRulesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RouteFiltersClient.cs => RouteFiltersOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RouteFiltersRestClient.cs => RouteFiltersRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RouteTablesClient.cs => RouteTablesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RouteTablesRestClient.cs => RouteTablesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RoutesClient.cs => RoutesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{RoutesRestClient.cs => RoutesRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{SecurityPartnerProvidersClient.cs => SecurityPartnerProvidersOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{SecurityPartnerProvidersRestClient.cs => SecurityPartnerProvidersRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{SecurityRulesClient.cs => SecurityRulesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{SecurityRulesRestClient.cs => SecurityRulesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceAssociationLinksClient.cs => ServiceAssociationLinksOperations.cs} (84%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceAssociationLinksRestClient.cs => ServiceAssociationLinksRestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceEndpointPoliciesClient.cs => ServiceEndpointPoliciesOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceEndpointPoliciesRestClient.cs => ServiceEndpointPoliciesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceEndpointPolicyDefinitionsClient.cs => ServiceEndpointPolicyDefinitionsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceEndpointPolicyDefinitionsRestClient.cs => ServiceEndpointPolicyDefinitionsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceClient.cs => ServiceOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceRestClient.cs => ServiceRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceTagsClient.cs => ServiceTagsOperations.cs} (82%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{ServiceTagsRestClient.cs => ServiceTagsRestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{SubnetsClient.cs => SubnetsOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{SubnetsRestClient.cs => SubnetsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{UsagesClient.cs => UsagesOperations.cs} (87%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{UsagesRestClient.cs => UsagesRestOperations.cs} (97%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualHubRouteTableV2SClient.cs => VirtualHubRouteTableV2SOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualHubRouteTableV2SRestClient.cs => VirtualHubRouteTableV2SRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualHubsClient.cs => VirtualHubsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualHubsRestClient.cs => VirtualHubsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkGatewayConnectionsClient.cs => VirtualNetworkGatewayConnectionsOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkGatewayConnectionsRestClient.cs => VirtualNetworkGatewayConnectionsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkGatewaysClient.cs => VirtualNetworkGatewaysOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkGatewaysRestClient.cs => VirtualNetworkGatewaysRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkPeeringsClient.cs => VirtualNetworkPeeringsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkPeeringsRestClient.cs => VirtualNetworkPeeringsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkTapsClient.cs => VirtualNetworkTapsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworkTapsRestClient.cs => VirtualNetworkTapsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworksClient.cs => VirtualNetworksOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualNetworksRestClient.cs => VirtualNetworksRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualRouterPeeringsClient.cs => VirtualRouterPeeringsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualRouterPeeringsRestClient.cs => VirtualRouterPeeringsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualRoutersClient.cs => VirtualRoutersOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualRoutersRestClient.cs => VirtualRoutersRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualWansClient.cs => VirtualWansOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VirtualWansRestClient.cs => VirtualWansRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnConnectionsClient.cs => VpnConnectionsOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnConnectionsRestClient.cs => VpnConnectionsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnGatewaysClient.cs => VpnGatewaysOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnGatewaysRestClient.cs => VpnGatewaysRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnLinkConnectionsClient.cs => VpnLinkConnectionsOperations.cs} (89%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnLinkConnectionsRestClient.cs => VpnLinkConnectionsRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnServerConfigurationsAssociatedWithVirtualWanClient.cs => VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs} (89%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs => VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnServerConfigurationsClient.cs => VpnServerConfigurationsOperations.cs} (93%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnServerConfigurationsRestClient.cs => VpnServerConfigurationsRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSiteLinkConnectionsClient.cs => VpnSiteLinkConnectionsOperations.cs} (85%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSiteLinkConnectionsRestClient.cs => VpnSiteLinkConnectionsRestOperations.cs} (96%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSiteLinksClient.cs => VpnSiteLinksOperations.cs} (91%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSiteLinksRestClient.cs => VpnSiteLinksRestOperations.cs} (98%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSitesConfigurationClient.cs => VpnSitesConfigurationOperations.cs} (88%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSitesConfigurationRestClient.cs => VpnSitesConfigurationRestOperations.cs} (95%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSitesClient.cs => VpnSitesOperations.cs} (94%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{VpnSitesRestClient.cs => VpnSitesRestOperations.cs} (99%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{WebApplicationFirewallPoliciesClient.cs => WebApplicationFirewallPoliciesOperations.cs} (91%)
 rename sdk/network/Azure.ResourceManager.Network/src/Generated/{WebApplicationFirewallPoliciesRestClient.cs => WebApplicationFirewallPoliciesRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ApplicationDefinitionsClient.cs => ApplicationDefinitionsOperations.cs} (94%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ApplicationDefinitionsRestClient.cs => ApplicationDefinitionsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ApplicationsClient.cs => ApplicationsOperations.cs} (95%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ApplicationsRestClient.cs => ApplicationsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{AuthorizationClient.cs => AuthorizationOperations.cs} (88%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{AuthorizationRestClient.cs => AuthorizationRestOperations.cs} (97%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{DeploymentClient.cs => DeploymentOperations.cs} (94%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{DeploymentRestClient.cs => DeploymentRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{DeploymentScriptsClient.cs => DeploymentScriptsOperations.cs} (94%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{DeploymentScriptsRestClient.cs => DeploymentScriptsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{DeploymentsClient.cs => DeploymentsOperations.cs} (95%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{DeploymentsRestClient.cs => DeploymentsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{FeaturesClient.cs => FeaturesOperations.cs} (93%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{FeaturesRestClient.cs => FeaturesRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ManagementLocksClient.cs => ManagementLocksOperations.cs} (95%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ManagementLocksRestClient.cs => ManagementLocksRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{OperationsClient.cs => Operations.cs} (85%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{PolicyAssignmentsClient.cs => PolicyAssignmentsOperations.cs} (96%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{PolicyAssignmentsRestClient.cs => PolicyAssignmentsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{PolicyDefinitionsClient.cs => PolicyDefinitionsOperations.cs} (93%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{PolicyDefinitionsRestClient.cs => PolicyDefinitionsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{PolicySetDefinitionsClient.cs => PolicySetDefinitionsOperations.cs} (93%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{PolicySetDefinitionsRestClient.cs => PolicySetDefinitionsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ProvidersClient.cs => ProvidersOperations.cs} (93%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ProvidersRestClient.cs => ProvidersRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ResourceGroupsClient.cs => ResourceGroupsOperations.cs} (94%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ResourceGroupsRestClient.cs => ResourceGroupsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ResourceLinksClient.cs => ResourceLinksOperations.cs} (93%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ResourceLinksRestClient.cs => ResourceLinksRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ResourcesClient.cs => ResourcesOperations.cs} (97%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ResourcesRestClient.cs => ResourcesRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (96%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ServiceClient.cs => ServiceOperations.cs} (86%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{ServiceRestClient.cs => ServiceRestOperations.cs} (96%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{SubscriptionsClient.cs => SubscriptionsOperations.cs} (92%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{SubscriptionsRestClient.cs => SubscriptionsRestOperations.cs} (98%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{TagsClient.cs => TagsOperations.cs} (94%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{TagsRestClient.cs => TagsRestOperations.cs} (99%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{TenantsClient.cs => TenantsOperations.cs} (86%)
 rename sdk/resources/Azure.ResourceManager.Resources/src/Generated/{TenantsRestClient.cs => TenantsRestOperations.cs} (96%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{BlobContainersClient.cs => BlobContainersOperations.cs} (96%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{BlobContainersRestClient.cs => BlobContainersRestOperations.cs} (99%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{BlobServicesClient.cs => BlobServicesOperations.cs} (92%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{BlobServicesRestClient.cs => BlobServicesRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{EncryptionScopesClient.cs => EncryptionScopesOperations.cs} (94%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{EncryptionScopesRestClient.cs => EncryptionScopesRestOperations.cs} (99%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{FileServicesClient.cs => FileServicesOperations.cs} (91%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{FileServicesRestClient.cs => FileServicesRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{FileSharesClient.cs => FileSharesOperations.cs} (95%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{FileSharesRestClient.cs => FileSharesRestOperations.cs} (99%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{ManagementPoliciesClient.cs => ManagementPoliciesOperations.cs} (91%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{ManagementPoliciesRestClient.cs => ManagementPoliciesRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{ObjectReplicationPoliciesClient.cs => ObjectReplicationPoliciesOperations.cs} (93%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{ObjectReplicationPoliciesRestClient.cs => ObjectReplicationPoliciesRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{OperationsClient.cs => Operations.cs} (80%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{PrivateEndpointConnectionsClient.cs => PrivateEndpointConnectionsOperations.cs} (93%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{PrivateEndpointConnectionsRestClient.cs => PrivateEndpointConnectionsRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{PrivateLinkResourcesClient.cs => PrivateLinkResourcesOperations.cs} (83%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{PrivateLinkResourcesRestClient.cs => PrivateLinkResourcesRestOperations.cs} (96%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{QueueClient.cs => QueueOperations.cs} (95%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{QueueRestClient.cs => QueueRestOperations.cs} (99%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{QueueServicesClient.cs => QueueServicesOperations.cs} (91%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{QueueServicesRestClient.cs => QueueServicesRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (94%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{SkusClient.cs => SkusOperations.cs} (82%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{SkusRestClient.cs => SkusRestOperations.cs} (94%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{StorageAccountsClient.cs => StorageAccountsOperations.cs} (95%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{StorageAccountsRestClient.cs => StorageAccountsRestOperations.cs} (99%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{TableClient.cs => TableOperations.cs} (95%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{TableRestClient.cs => TableRestOperations.cs} (99%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{TableServicesClient.cs => TableServicesOperations.cs} (91%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{TableServicesRestClient.cs => TableServicesRestOperations.cs} (98%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{UsagesClient.cs => UsagesOperations.cs} (84%)
 rename sdk/storage/Azure.ResourceManager.Storage/src/Generated/{UsagesRestClient.cs => UsagesRestOperations.cs} (94%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{ApplicationsClient.cs => ApplicationsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{ApplicationsRestClient.cs => ApplicationsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{DeletedApplicationsClient.cs => DeletedApplicationsOperations.cs} (91%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{DeletedApplicationsRestClient.cs => DeletedApplicationsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{DomainsClient.cs => DomainsOperations.cs} (86%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{DomainsRestClient.cs => DomainsRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{GroupsClient.cs => GroupsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{GroupsRestClient.cs => GroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{OAuth2PermissionGrantClient.cs => OAuth2PermissionGrantOperations.cs} (91%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{OAuth2PermissionGrantRestClient.cs => OAuth2PermissionGrantRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{ObjectsClient.cs => ObjectsOperations.cs} (90%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{ObjectsRestClient.cs => ObjectsRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{ServicePrincipalsClient.cs => ServicePrincipalsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{ServicePrincipalsRestClient.cs => ServicePrincipalsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{SignedInUserClient.cs => SignedInUserOperations.cs} (91%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{SignedInUserRestClient.cs => SignedInUserRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{UsersClient.cs => UsersOperations.cs} (94%)
 rename sdk/testcommon/Azure.Graph.Rbac/src/Generated/{UsersRestClient.cs => UsersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{AvailabilitySetsClient.cs => AvailabilitySetsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{AvailabilitySetsRestClient.cs => AvailabilitySetsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ContainerServicesClient.cs => ContainerServicesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ContainerServicesRestClient.cs => ContainerServicesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DedicatedHostGroupsClient.cs => DedicatedHostGroupsOperations.cs} (92%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DedicatedHostGroupsRestClient.cs => DedicatedHostGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DedicatedHostsClient.cs => DedicatedHostsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DedicatedHostsRestClient.cs => DedicatedHostsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DiskEncryptionSetsClient.cs => DiskEncryptionSetsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DiskEncryptionSetsRestClient.cs => DiskEncryptionSetsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DisksClient.cs => DisksOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{DisksRestClient.cs => DisksRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleriesClient.cs => GalleriesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleriesRestClient.cs => GalleriesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryApplicationVersionsClient.cs => GalleryApplicationVersionsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryApplicationVersionsRestClient.cs => GalleryApplicationVersionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryApplicationsClient.cs => GalleryApplicationsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryApplicationsRestClient.cs => GalleryApplicationsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryImageVersionsClient.cs => GalleryImageVersionsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryImageVersionsRestClient.cs => GalleryImageVersionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryImagesClient.cs => GalleryImagesOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{GalleryImagesRestClient.cs => GalleryImagesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ImagesClient.cs => ImagesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ImagesRestClient.cs => ImagesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{LogAnalyticsClient.cs => LogAnalyticsOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{LogAnalyticsRestClient.cs => LogAnalyticsRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{OperationsClient.cs => Operations.cs} (81%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ProximityPlacementGroupsClient.cs => ProximityPlacementGroupsOperations.cs} (92%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ProximityPlacementGroupsRestClient.cs => ProximityPlacementGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ResourceSkusClient.cs => ResourceSkusOperations.cs} (88%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{ResourceSkusRestClient.cs => ResourceSkusRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{SnapshotsClient.cs => SnapshotsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{SnapshotsRestClient.cs => SnapshotsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{SshPublicKeysClient.cs => SshPublicKeysOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{SshPublicKeysRestClient.cs => SshPublicKeysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{UsageClient.cs => UsageOperations.cs} (88%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{UsageRestClient.cs => UsageRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineExtensionImagesClient.cs => VirtualMachineExtensionImagesOperations.cs} (89%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineExtensionImagesRestClient.cs => VirtualMachineExtensionImagesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineExtensionsClient.cs => VirtualMachineExtensionsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineExtensionsRestClient.cs => VirtualMachineExtensionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineImagesClient.cs => VirtualMachineImagesOperations.cs} (92%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineImagesRestClient.cs => VirtualMachineImagesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineRunCommandsClient.cs => VirtualMachineRunCommandsOperations.cs} (89%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineRunCommandsRestClient.cs => VirtualMachineRunCommandsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetExtensionsClient.cs => VirtualMachineScaleSetExtensionsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetExtensionsRestClient.cs => VirtualMachineScaleSetExtensionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetRollingUpgradesClient.cs => VirtualMachineScaleSetRollingUpgradesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetRollingUpgradesRestClient.cs => VirtualMachineScaleSetRollingUpgradesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetVMExtensionsClient.cs => VirtualMachineScaleSetVMExtensionsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetVMExtensionsRestClient.cs => VirtualMachineScaleSetVMExtensionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetVMsClient.cs => VirtualMachineScaleSetVMsOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetVMsRestClient.cs => VirtualMachineScaleSetVMsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetsClient.cs => VirtualMachineScaleSetsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineScaleSetsRestClient.cs => VirtualMachineScaleSetsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineSizesClient.cs => VirtualMachineSizesOperations.cs} (86%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachineSizesRestClient.cs => VirtualMachineSizesRestOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachinesClient.cs => VirtualMachinesOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/{VirtualMachinesRestClient.cs => VirtualMachinesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ApplicationGatewaysClient.cs => ApplicationGatewaysOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ApplicationGatewaysRestClient.cs => ApplicationGatewaysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ApplicationSecurityGroupsClient.cs => ApplicationSecurityGroupsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ApplicationSecurityGroupsRestClient.cs => ApplicationSecurityGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableDelegationsClient.cs => AvailableDelegationsOperations.cs} (88%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableDelegationsRestClient.cs => AvailableDelegationsRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableEndpointServicesClient.cs => AvailableEndpointServicesOperations.cs} (87%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableEndpointServicesRestClient.cs => AvailableEndpointServicesRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailablePrivateEndpointTypesClient.cs => AvailablePrivateEndpointTypesOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailablePrivateEndpointTypesRestClient.cs => AvailablePrivateEndpointTypesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableResourceGroupDelegationsClient.cs => AvailableResourceGroupDelegationsOperations.cs} (88%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableResourceGroupDelegationsRestClient.cs => AvailableResourceGroupDelegationsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableServiceAliasesClient.cs => AvailableServiceAliasesOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AvailableServiceAliasesRestClient.cs => AvailableServiceAliasesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AzureFirewallFqdnTagsClient.cs => AzureFirewallFqdnTagsOperations.cs} (86%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AzureFirewallFqdnTagsRestClient.cs => AzureFirewallFqdnTagsRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AzureFirewallsClient.cs => AzureFirewallsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{AzureFirewallsRestClient.cs => AzureFirewallsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{BastionHostsClient.cs => BastionHostsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{BastionHostsRestClient.cs => BastionHostsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{BgpServiceCommunitiesClient.cs => BgpServiceCommunitiesOperations.cs} (86%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{BgpServiceCommunitiesRestClient.cs => BgpServiceCommunitiesRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ConnectionMonitorsClient.cs => ConnectionMonitorsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ConnectionMonitorsRestClient.cs => ConnectionMonitorsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{DdosCustomPoliciesClient.cs => DdosCustomPoliciesOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{DdosCustomPoliciesRestClient.cs => DdosCustomPoliciesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{DdosProtectionPlansClient.cs => DdosProtectionPlansOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{DdosProtectionPlansRestClient.cs => DdosProtectionPlansRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{DefaultSecurityRulesClient.cs => DefaultSecurityRulesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{DefaultSecurityRulesRestClient.cs => DefaultSecurityRulesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitAuthorizationsClient.cs => ExpressRouteCircuitAuthorizationsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitAuthorizationsRestClient.cs => ExpressRouteCircuitAuthorizationsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitConnectionsClient.cs => ExpressRouteCircuitConnectionsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitConnectionsRestClient.cs => ExpressRouteCircuitConnectionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitPeeringsClient.cs => ExpressRouteCircuitPeeringsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitPeeringsRestClient.cs => ExpressRouteCircuitPeeringsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitsClient.cs => ExpressRouteCircuitsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCircuitsRestClient.cs => ExpressRouteCircuitsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteConnectionsClient.cs => ExpressRouteConnectionsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteConnectionsRestClient.cs => ExpressRouteConnectionsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCrossConnectionPeeringsClient.cs => ExpressRouteCrossConnectionPeeringsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCrossConnectionPeeringsRestClient.cs => ExpressRouteCrossConnectionPeeringsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCrossConnectionsClient.cs => ExpressRouteCrossConnectionsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteCrossConnectionsRestClient.cs => ExpressRouteCrossConnectionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteGatewaysClient.cs => ExpressRouteGatewaysOperations.cs} (92%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteGatewaysRestClient.cs => ExpressRouteGatewaysRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteLinksClient.cs => ExpressRouteLinksOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteLinksRestClient.cs => ExpressRouteLinksRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRoutePortsLocationsClient.cs => ExpressRoutePortsLocationsOperations.cs} (88%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRoutePortsLocationsRestClient.cs => ExpressRoutePortsLocationsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRoutePortsClient.cs => ExpressRoutePortsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRoutePortsRestClient.cs => ExpressRoutePortsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteServiceProvidersClient.cs => ExpressRouteServiceProvidersOperations.cs} (85%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ExpressRouteServiceProvidersRestClient.cs => ExpressRouteServiceProvidersRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{FirewallPoliciesClient.cs => FirewallPoliciesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{FirewallPoliciesRestClient.cs => FirewallPoliciesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{FirewallPolicyRuleGroupsClient.cs => FirewallPolicyRuleGroupsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{FirewallPolicyRuleGroupsRestClient.cs => FirewallPolicyRuleGroupsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{FlowLogsClient.cs => FlowLogsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{FlowLogsRestClient.cs => FlowLogsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{HubRouteTablesClient.cs => HubRouteTablesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{HubRouteTablesRestClient.cs => HubRouteTablesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{HubVirtualNetworkConnectionsClient.cs => HubVirtualNetworkConnectionsOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{HubVirtualNetworkConnectionsRestClient.cs => HubVirtualNetworkConnectionsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{InboundNatRulesClient.cs => InboundNatRulesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{InboundNatRulesRestClient.cs => InboundNatRulesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{IpAllocationsClient.cs => IpAllocationsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{IpAllocationsRestClient.cs => IpAllocationsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{IpGroupsClient.cs => IpGroupsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{IpGroupsRestClient.cs => IpGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerBackendAddressPoolsClient.cs => LoadBalancerBackendAddressPoolsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerBackendAddressPoolsRestClient.cs => LoadBalancerBackendAddressPoolsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerFrontendIPConfigurationsClient.cs => LoadBalancerFrontendIPConfigurationsOperations.cs} (89%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerFrontendIPConfigurationsRestClient.cs => LoadBalancerFrontendIPConfigurationsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerLoadBalancingRulesClient.cs => LoadBalancerLoadBalancingRulesOperations.cs} (89%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerLoadBalancingRulesRestClient.cs => LoadBalancerLoadBalancingRulesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerNetworkInterfacesClient.cs => LoadBalancerNetworkInterfacesOperations.cs} (87%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerNetworkInterfacesRestClient.cs => LoadBalancerNetworkInterfacesRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerOutboundRulesClient.cs => LoadBalancerOutboundRulesOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerOutboundRulesRestClient.cs => LoadBalancerOutboundRulesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerProbesClient.cs => LoadBalancerProbesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancerProbesRestClient.cs => LoadBalancerProbesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancersClient.cs => LoadBalancersOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LoadBalancersRestClient.cs => LoadBalancersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LocalNetworkGatewaysClient.cs => LocalNetworkGatewaysOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{LocalNetworkGatewaysRestClient.cs => LocalNetworkGatewaysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NatGatewaysClient.cs => NatGatewaysOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NatGatewaysRestClient.cs => NatGatewaysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfaceIPConfigurationsClient.cs => NetworkInterfaceIPConfigurationsOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfaceIPConfigurationsRestClient.cs => NetworkInterfaceIPConfigurationsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfaceLoadBalancersClient.cs => NetworkInterfaceLoadBalancersOperations.cs} (87%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfaceLoadBalancersRestClient.cs => NetworkInterfaceLoadBalancersRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfaceTapConfigurationsClient.cs => NetworkInterfaceTapConfigurationsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfaceTapConfigurationsRestClient.cs => NetworkInterfaceTapConfigurationsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfacesClient.cs => NetworkInterfacesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkInterfacesRestClient.cs => NetworkInterfacesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkProfilesClient.cs => NetworkProfilesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkProfilesRestClient.cs => NetworkProfilesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkSecurityGroupsClient.cs => NetworkSecurityGroupsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkSecurityGroupsRestClient.cs => NetworkSecurityGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkVirtualAppliancesClient.cs => NetworkVirtualAppliancesOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkVirtualAppliancesRestClient.cs => NetworkVirtualAppliancesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkWatchersClient.cs => NetworkWatchersOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{NetworkWatchersRestClient.cs => NetworkWatchersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{OperationsClient.cs => Operations.cs} (85%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{P2SVpnGatewaysClient.cs => P2SVpnGatewaysOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{P2SVpnGatewaysRestClient.cs => P2SVpnGatewaysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PacketCapturesClient.cs => PacketCapturesOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PacketCapturesRestClient.cs => PacketCapturesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PeerExpressRouteCircuitConnectionsClient.cs => PeerExpressRouteCircuitConnectionsOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PeerExpressRouteCircuitConnectionsRestClient.cs => PeerExpressRouteCircuitConnectionsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PrivateDnsZoneGroupsClient.cs => PrivateDnsZoneGroupsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PrivateDnsZoneGroupsRestClient.cs => PrivateDnsZoneGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PrivateEndpointsClient.cs => PrivateEndpointsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PrivateEndpointsRestClient.cs => PrivateEndpointsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PrivateLinkServicesClient.cs => PrivateLinkServicesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PrivateLinkServicesRestClient.cs => PrivateLinkServicesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PublicIPAddressesClient.cs => PublicIPAddressesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PublicIPAddressesRestClient.cs => PublicIPAddressesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PublicIPPrefixesClient.cs => PublicIPPrefixesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{PublicIPPrefixesRestClient.cs => PublicIPPrefixesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ResourceNavigationLinksClient.cs => ResourceNavigationLinksOperations.cs} (84%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ResourceNavigationLinksRestClient.cs => ResourceNavigationLinksRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RouteFilterRulesClient.cs => RouteFilterRulesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RouteFilterRulesRestClient.cs => RouteFilterRulesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RouteFiltersClient.cs => RouteFiltersOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RouteFiltersRestClient.cs => RouteFiltersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RouteTablesClient.cs => RouteTablesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RouteTablesRestClient.cs => RouteTablesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RoutesClient.cs => RoutesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{RoutesRestClient.cs => RoutesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{SecurityPartnerProvidersClient.cs => SecurityPartnerProvidersOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{SecurityPartnerProvidersRestClient.cs => SecurityPartnerProvidersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{SecurityRulesClient.cs => SecurityRulesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{SecurityRulesRestClient.cs => SecurityRulesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceAssociationLinksClient.cs => ServiceAssociationLinksOperations.cs} (84%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceAssociationLinksRestClient.cs => ServiceAssociationLinksRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceEndpointPoliciesClient.cs => ServiceEndpointPoliciesOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceEndpointPoliciesRestClient.cs => ServiceEndpointPoliciesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceEndpointPolicyDefinitionsClient.cs => ServiceEndpointPolicyDefinitionsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceEndpointPolicyDefinitionsRestClient.cs => ServiceEndpointPolicyDefinitionsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceClient.cs => ServiceOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceRestClient.cs => ServiceRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceTagsClient.cs => ServiceTagsOperations.cs} (82%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{ServiceTagsRestClient.cs => ServiceTagsRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{SubnetsClient.cs => SubnetsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{SubnetsRestClient.cs => SubnetsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{UsagesClient.cs => UsagesOperations.cs} (87%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{UsagesRestClient.cs => UsagesRestOperations.cs} (97%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualHubRouteTableV2SClient.cs => VirtualHubRouteTableV2SOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualHubRouteTableV2SRestClient.cs => VirtualHubRouteTableV2SRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualHubsClient.cs => VirtualHubsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualHubsRestClient.cs => VirtualHubsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkGatewayConnectionsClient.cs => VirtualNetworkGatewayConnectionsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkGatewayConnectionsRestClient.cs => VirtualNetworkGatewayConnectionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkGatewaysClient.cs => VirtualNetworkGatewaysOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkGatewaysRestClient.cs => VirtualNetworkGatewaysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkPeeringsClient.cs => VirtualNetworkPeeringsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkPeeringsRestClient.cs => VirtualNetworkPeeringsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkTapsClient.cs => VirtualNetworkTapsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworkTapsRestClient.cs => VirtualNetworkTapsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworksClient.cs => VirtualNetworksOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualNetworksRestClient.cs => VirtualNetworksRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualRouterPeeringsClient.cs => VirtualRouterPeeringsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualRouterPeeringsRestClient.cs => VirtualRouterPeeringsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualRoutersClient.cs => VirtualRoutersOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualRoutersRestClient.cs => VirtualRoutersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualWansClient.cs => VirtualWansOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VirtualWansRestClient.cs => VirtualWansRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnConnectionsClient.cs => VpnConnectionsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnConnectionsRestClient.cs => VpnConnectionsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnGatewaysClient.cs => VpnGatewaysOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnGatewaysRestClient.cs => VpnGatewaysRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnLinkConnectionsClient.cs => VpnLinkConnectionsOperations.cs} (89%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnLinkConnectionsRestClient.cs => VpnLinkConnectionsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnServerConfigurationsAssociatedWithVirtualWanClient.cs => VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs} (89%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs => VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnServerConfigurationsClient.cs => VpnServerConfigurationsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnServerConfigurationsRestClient.cs => VpnServerConfigurationsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSiteLinkConnectionsClient.cs => VpnSiteLinkConnectionsOperations.cs} (85%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSiteLinkConnectionsRestClient.cs => VpnSiteLinkConnectionsRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSiteLinksClient.cs => VpnSiteLinksOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSiteLinksRestClient.cs => VpnSiteLinksRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSitesConfigurationClient.cs => VpnSitesConfigurationOperations.cs} (88%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSitesConfigurationRestClient.cs => VpnSitesConfigurationRestOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSitesClient.cs => VpnSitesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{VpnSitesRestClient.cs => VpnSitesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{WebApplicationFirewallPoliciesClient.cs => WebApplicationFirewallPoliciesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/{WebApplicationFirewallPoliciesRestClient.cs => WebApplicationFirewallPoliciesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{DeploymentClient.cs => DeploymentOperations.cs} (90%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{DeploymentRestClient.cs => DeploymentRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{DeploymentsClient.cs => DeploymentsOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{DeploymentsRestClient.cs => DeploymentsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{ProvidersClient.cs => ProvidersOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{ProvidersRestClient.cs => ProvidersRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{ResourceGroupsClient.cs => ResourceGroupsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{ResourceGroupsRestClient.cs => ResourceGroupsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{ResourcesClient.cs => ResourcesOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{ResourcesRestClient.cs => ResourcesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{TagsClient.cs => TagsOperations.cs} (92%)
 rename sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/{TagsRestClient.cs => TagsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{BlobContainersClient.cs => BlobContainersOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{BlobContainersRestClient.cs => BlobContainersRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{BlobServicesClient.cs => BlobServicesOperations.cs} (92%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{BlobServicesRestClient.cs => BlobServicesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{EncryptionScopesClient.cs => EncryptionScopesOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{EncryptionScopesRestClient.cs => EncryptionScopesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{FileServicesClient.cs => FileServicesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{FileServicesRestClient.cs => FileServicesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{FileSharesClient.cs => FileSharesOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{FileSharesRestClient.cs => FileSharesRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{ManagementPoliciesClient.cs => ManagementPoliciesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{ManagementPoliciesRestClient.cs => ManagementPoliciesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{ObjectReplicationPoliciesClient.cs => ObjectReplicationPoliciesOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{ObjectReplicationPoliciesRestClient.cs => ObjectReplicationPoliciesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{OperationsClient.cs => Operations.cs} (80%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{PrivateEndpointConnectionsClient.cs => PrivateEndpointConnectionsOperations.cs} (93%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{PrivateEndpointConnectionsRestClient.cs => PrivateEndpointConnectionsRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{PrivateLinkResourcesClient.cs => PrivateLinkResourcesOperations.cs} (83%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{PrivateLinkResourcesRestClient.cs => PrivateLinkResourcesRestOperations.cs} (96%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{QueueClient.cs => QueueOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{QueueRestClient.cs => QueueRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{QueueServicesClient.cs => QueueServicesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{QueueServicesRestClient.cs => QueueServicesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{OperationsRestClient.cs => RestOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{SkusClient.cs => SkusOperations.cs} (82%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{SkusRestClient.cs => SkusRestOperations.cs} (94%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{StorageAccountsClient.cs => StorageAccountsOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{StorageAccountsRestClient.cs => StorageAccountsRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{TableClient.cs => TableOperations.cs} (95%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{TableRestClient.cs => TableRestOperations.cs} (99%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{TableServicesClient.cs => TableServicesOperations.cs} (91%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{TableServicesRestClient.cs => TableServicesRestOperations.cs} (98%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{UsagesClient.cs => UsagesOperations.cs} (84%)
 rename sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/{UsagesRestClient.cs => UsagesRestOperations.cs} (94%)

diff --git a/eng/CodeGeneration.targets b/eng/CodeGeneration.targets
index d49e98c8d0e42..488f8014da8e8 100644
--- a/eng/CodeGeneration.targets
+++ b/eng/CodeGeneration.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <_AutoRestVersion>https://github.com/Azure/autorest/releases/download/autorest-3.0.6223/autorest-3.0.6223.tgz</_AutoRestVersion>
     <_AutoRestCoreVersion>3.0.6283</_AutoRestCoreVersion>
-    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200610.1/autorest-csharp-v3-3.0.0-dev.20200610.1.tgz</_AutoRestCSharpVersion>
+    <_AutoRestCSharpVersion>https://github.com/Azure/autorest.csharp/releases/download/3.0.0-dev.20200612.2/autorest-csharp-v3-3.0.0-dev.20200612.2.tgz</_AutoRestCSharpVersion>
     <_SupportsCodeGeneration Condition="'$(IsClientLibrary)' == 'true'">true</_SupportsCodeGeneration>
     <_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md</_DefaultInputName>
     <AutoRestInput Condition="'$(AutoRestInput)' == ''">$(_DefaultInputName)</AutoRestInput>
@@ -51,3 +51,4 @@
 
 
 
+
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/AppConfigurationManagementClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/AppConfigurationManagementClient.cs
index cae8d789700ff..f26be91e3a01d 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/AppConfigurationManagementClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/AppConfigurationManagementClient.cs
@@ -53,28 +53,16 @@ public AppConfigurationManagementClient(string subscriptionId, Uri endpoint, Tok
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of ConfigurationStoresClient. </summary>
-        public virtual ConfigurationStoresClient GetConfigurationStoresClient()
-        {
-            return new ConfigurationStoresClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ConfigurationStoresOperations. </summary>
+        public virtual ConfigurationStoresOperations ConfigurationStores => new ConfigurationStoresOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateEndpointConnectionsClient. </summary>
-        public virtual PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient()
-        {
-            return new PrivateEndpointConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateEndpointConnectionsOperations. </summary>
+        public virtual PrivateEndpointConnectionsOperations PrivateEndpointConnections => new PrivateEndpointConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateLinkResourcesClient. </summary>
-        public virtual PrivateLinkResourcesClient GetPrivateLinkResourcesClient()
-        {
-            return new PrivateLinkResourcesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateLinkResourcesOperations. </summary>
+        public virtual PrivateLinkResourcesOperations PrivateLinkResources => new PrivateLinkResourcesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresOperations.cs
similarity index 95%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresOperations.cs
index 22b18e5b3adbe..2bb4cca4f6550 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.AppConfiguration
 {
     /// <summary> The ConfigurationStores service client. </summary>
-    public partial class ConfigurationStoresClient
+    public partial class ConfigurationStoresOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ConfigurationStoresRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ConfigurationStoresClient for mocking. </summary>
-        protected ConfigurationStoresClient()
+        internal ConfigurationStoresRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ConfigurationStoresOperations for mocking. </summary>
+        protected ConfigurationStoresOperations()
         {
         }
-        /// <summary> Initializes a new instance of ConfigurationStoresClient. </summary>
+        /// <summary> Initializes a new instance of ConfigurationStoresOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ConfigurationStoresClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        internal ConfigurationStoresOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
-            RestClient = new ConfigurationStoresRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ConfigurationStoresRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ConfigurationStoresClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConfigurationStore>> GetAsync(string resourceGroupName, string configStoreName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.Get");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ConfigurationStore>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConfigurationStore> Get(string resourceGroupName, string configStoreName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.Get");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<ConfigurationStore> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApiKey>> RegenerateKeyAsync(string resourceGroupName, string configStoreName, RegenerateKeyParameters regenerateKeyParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.RegenerateKey");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.RegenerateKey");
             scope.Start();
             try
             {
@@ -103,7 +103,7 @@ public virtual async Task<Response<ApiKey>> RegenerateKeyAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApiKey> RegenerateKey(string resourceGroupName, string configStoreName, RegenerateKeyParameters regenerateKeyParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.RegenerateKey");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.RegenerateKey");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<ApiKey> RegenerateKey(string resourceGroupName, string c
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<KeyValue>> ListKeyValueAsync(string resourceGroupName, string configStoreName, ListKeyValueParameters listKeyValueParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListKeyValue");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListKeyValue");
             scope.Start();
             try
             {
@@ -143,7 +143,7 @@ public virtual async Task<Response<KeyValue>> ListKeyValueAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<KeyValue> ListKeyValue(string resourceGroupName, string configStoreName, ListKeyValueParameters listKeyValueParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListKeyValue");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListKeyValue");
             scope.Start();
             try
             {
@@ -163,7 +163,7 @@ public virtual AsyncPageable<ConfigurationStore> ListAsync(string skipToken = nu
         {
             async Task<Page<ConfigurationStore>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.List");
                 scope.Start();
                 try
                 {
@@ -178,7 +178,7 @@ async Task<Page<ConfigurationStore>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ConfigurationStore>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.List");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual Pageable<ConfigurationStore> List(string skipToken = null, Cancel
         {
             Page<ConfigurationStore> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.List");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ Page<ConfigurationStore> FirstPageFunc(int? pageSizeHint)
             }
             Page<ConfigurationStore> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.List");
                 scope.Start();
                 try
                 {
@@ -245,7 +245,7 @@ public virtual AsyncPageable<ConfigurationStore> ListByResourceGroupAsync(string
 
             async Task<Page<ConfigurationStore>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -260,7 +260,7 @@ async Task<Page<ConfigurationStore>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ConfigurationStore>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -289,7 +289,7 @@ public virtual Pageable<ConfigurationStore> ListByResourceGroup(string resourceG
 
             Page<ConfigurationStore> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -304,7 +304,7 @@ Page<ConfigurationStore> FirstPageFunc(int? pageSizeHint)
             }
             Page<ConfigurationStore> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -338,7 +338,7 @@ public virtual AsyncPageable<ApiKey> ListKeysAsync(string resourceGroupName, str
 
             async Task<Page<ApiKey>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListKeys");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListKeys");
                 scope.Start();
                 try
                 {
@@ -353,7 +353,7 @@ async Task<Page<ApiKey>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApiKey>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListKeys");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListKeys");
                 scope.Start();
                 try
                 {
@@ -387,7 +387,7 @@ public virtual Pageable<ApiKey> ListKeys(string resourceGroupName, string config
 
             Page<ApiKey> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListKeys");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListKeys");
                 scope.Start();
                 try
                 {
@@ -402,7 +402,7 @@ Page<ApiKey> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApiKey> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.ListKeys");
+                using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.ListKeys");
                 scope.Start();
                 try
                 {
@@ -438,7 +438,7 @@ public virtual async Task<ConfigurationStoresCreateOperation> StartCreateAsync(s
                 throw new ArgumentNullException(nameof(configStoreCreationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.StartCreate");
             scope.Start();
             try
             {
@@ -472,7 +472,7 @@ public virtual ConfigurationStoresCreateOperation StartCreate(string resourceGro
                 throw new ArgumentNullException(nameof(configStoreCreationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.StartCreate");
             scope.Start();
             try
             {
@@ -501,7 +501,7 @@ public virtual async Task<ConfigurationStoresDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(configStoreName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.StartDelete");
             scope.Start();
             try
             {
@@ -530,7 +530,7 @@ public virtual ConfigurationStoresDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(configStoreName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.StartDelete");
             scope.Start();
             try
             {
@@ -564,7 +564,7 @@ public virtual async Task<ConfigurationStoresUpdateOperation> StartUpdateAsync(s
                 throw new ArgumentNullException(nameof(configStoreUpdateParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -598,7 +598,7 @@ public virtual ConfigurationStoresUpdateOperation StartUpdate(string resourceGro
                 throw new ArgumentNullException(nameof(configStoreUpdateParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationStoresOperations.StartUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresRestClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresRestOperations.cs
similarity index 99%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresRestClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresRestOperations.cs
index c1ed5b7a89604..2a9b77c850706 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresRestClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/ConfigurationStoresRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.AppConfiguration
 {
-    internal partial class ConfigurationStoresRestClient
+    internal partial class ConfigurationStoresRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ConfigurationStoresRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ConfigurationStoresRestClient. </summary>
+        /// <summary> Initializes a new instance of ConfigurationStoresRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ConfigurationStoresRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        public ConfigurationStoresRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/OperationsClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/Operations.cs
similarity index 88%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/OperationsClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/Operations.cs
index c112eeb6132f1..f216b942e83d7 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/OperationsClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/Operations.cs
@@ -15,25 +15,25 @@
 
 namespace Azure.ResourceManager.AppConfiguration
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NameAvailabilityStatus>> CheckNameAvailabilityAsync(CheckNameAvailabilityParameters checkNameAvailabilityParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("OperationsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("Operations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<NameAvailabilityStatus>> CheckNameAvailabilit
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NameAvailabilityStatus> CheckNameAvailability(CheckNameAvailabilityParameters checkNameAvailabilityParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("OperationsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("Operations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual AsyncPageable<OperationDefinition> ListAsync(string skipToken = n
         {
             async Task<Page<OperationDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -96,7 +96,7 @@ async Task<Page<OperationDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OperationDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -119,7 +119,7 @@ public virtual Pageable<OperationDefinition> List(string skipToken = null, Cance
         {
             Page<OperationDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -134,7 +134,7 @@ Page<OperationDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<OperationDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsOperations.cs
similarity index 93%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsOperations.cs
index 1cad833f99d4b..3dc435755525a 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.AppConfiguration
 {
     /// <summary> The PrivateEndpointConnections service client. </summary>
-    public partial class PrivateEndpointConnectionsClient
+    public partial class PrivateEndpointConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateEndpointConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient for mocking. </summary>
-        protected PrivateEndpointConnectionsClient()
+        internal PrivateEndpointConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations for mocking. </summary>
+        protected PrivateEndpointConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        internal PrivateEndpointConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
-            RestClient = new PrivateEndpointConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateEndpointConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -95,7 +95,7 @@ public virtual AsyncPageable<PrivateEndpointConnection> ListByConfigurationStore
 
             async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -110,7 +110,7 @@ async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpointConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -143,7 +143,7 @@ public virtual Pageable<PrivateEndpointConnection> ListByConfigurationStore(stri
 
             Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpointConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -199,7 +199,7 @@ public virtual async Task<PrivateEndpointConnectionsCreateOrUpdateOperation> Sta
                 throw new ArgumentNullException(nameof(privateEndpointConnection));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -238,7 +238,7 @@ public virtual PrivateEndpointConnectionsCreateOrUpdateOperation StartCreateOrUp
                 throw new ArgumentNullException(nameof(privateEndpointConnection));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -272,7 +272,7 @@ public virtual async Task<PrivateEndpointConnectionsDeleteOperation> StartDelete
                 throw new ArgumentNullException(nameof(privateEndpointConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -306,7 +306,7 @@ public virtual PrivateEndpointConnectionsDeleteOperation StartDelete(string reso
                 throw new ArgumentNullException(nameof(privateEndpointConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsRestClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsRestOperations.cs
similarity index 98%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsRestClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsRestOperations.cs
index 2a2377f6a5e6c..ee5732051a003 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsRestClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateEndpointConnectionsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.AppConfiguration
 {
-    internal partial class PrivateEndpointConnectionsRestClient
+    internal partial class PrivateEndpointConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateEndpointConnectionsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateEndpointConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        public PrivateEndpointConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesOperations.cs
similarity index 90%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesOperations.cs
index 1aa9df9fcd87f..51426ac100781 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.AppConfiguration
 {
     /// <summary> The PrivateLinkResources service client. </summary>
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateLinkResourcesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateLinkResourcesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient for mocking. </summary>
-        protected PrivateLinkResourcesClient()
+        internal PrivateLinkResourcesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations for mocking. </summary>
+        protected PrivateLinkResourcesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        internal PrivateLinkResourcesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
-            RestClient = new PrivateLinkResourcesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateLinkResourcesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkResource>> GetAsync(string resourceGroupName, string configStoreName, string groupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<PrivateLinkResource>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkResource> Get(string resourceGroupName, string configStoreName, string groupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.Get");
             scope.Start();
             try
             {
@@ -95,7 +95,7 @@ public virtual AsyncPageable<PrivateLinkResource> ListByConfigurationStoreAsync(
 
             async Task<Page<PrivateLinkResource>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -110,7 +110,7 @@ async Task<Page<PrivateLinkResource>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateLinkResource>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -143,7 +143,7 @@ public virtual Pageable<PrivateLinkResource> ListByConfigurationStore(string res
 
             Page<PrivateLinkResource> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ Page<PrivateLinkResource> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateLinkResource> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByConfigurationStore");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByConfigurationStore");
                 scope.Start();
                 try
                 {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesRestClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesRestOperations.cs
similarity index 98%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesRestClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesRestOperations.cs
index bc4b72d322c9a..efbd83fef21c4 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesRestClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/PrivateLinkResourcesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.AppConfiguration
 {
-    internal partial class PrivateLinkResourcesRestClient
+    internal partial class PrivateLinkResourcesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateLinkResourcesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateLinkResourcesRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateLinkResourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        public PrivateLinkResourcesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/OperationsRestClient.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/RestOperations.cs
similarity index 97%
rename from sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/OperationsRestClient.cs
rename to sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/RestOperations.cs
index 91a47845c944a..2eacf556d2994 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/OperationsRestClient.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/src/Generated/RestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.AppConfiguration
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class OperationsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The Microsoft Azure subscription ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-11-01-preview")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsOperations.cs
index 6bf51f167eaf8..23ceef34c9b01 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The AvailabilitySets service client. </summary>
-    public partial class AvailabilitySetsClient
+    public partial class AvailabilitySetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailabilitySetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailabilitySetsClient for mocking. </summary>
-        protected AvailabilitySetsClient()
+        internal AvailabilitySetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailabilitySetsOperations for mocking. </summary>
+        protected AvailabilitySetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailabilitySetsClient. </summary>
+        /// <summary> Initializes a new instance of AvailabilitySetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailabilitySetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailabilitySetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailabilitySetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailabilitySetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal AvailabilitySetsClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailabilitySet>> CreateOrUpdateAsync(string resourceGroupName, string availabilitySetName, AvailabilitySet parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<AvailabilitySet>> CreateOrUpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailabilitySet> CreateOrUpdate(string resourceGroupName, string availabilitySetName, AvailabilitySet parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<AvailabilitySet> CreateOrUpdate(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailabilitySet>> UpdateAsync(string resourceGroupName, string availabilitySetName, AvailabilitySetUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<AvailabilitySet>> UpdateAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailabilitySet> Update(string resourceGroupName, string availabilitySetName, AvailabilitySetUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<AvailabilitySet> Update(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Delete");
             scope.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response Delete(string resourceGroupName, string availabilitySetN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailabilitySet>> GetAsync(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Get");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<AvailabilitySet>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailabilitySet> Get(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Get");
             scope.Start();
             try
             {
@@ -200,7 +200,7 @@ public virtual AsyncPageable<AvailabilitySet> ListBySubscriptionAsync(string exp
         {
             async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailabilitySet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -238,7 +238,7 @@ public virtual Pageable<AvailabilitySet> ListBySubscription(string expand = null
         {
             Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -253,7 +253,7 @@ Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailabilitySet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -281,7 +281,7 @@ public virtual AsyncPageable<AvailabilitySet> ListAsync(string resourceGroupName
 
             async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -296,7 +296,7 @@ async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailabilitySet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -324,7 +324,7 @@ public virtual Pageable<AvailabilitySet> List(string resourceGroupName, Cancella
 
             Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -339,7 +339,7 @@ Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailabilitySet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -372,7 +372,7 @@ public virtual AsyncPageable<VirtualMachineSize> ListAvailableSizesAsync(string
 
             async Task<Page<VirtualMachineSize>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
@@ -405,7 +405,7 @@ public virtual Pageable<VirtualMachineSize> ListAvailableSizes(string resourceGr
 
             Page<VirtualMachineSize> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsRestOperations.cs
index 1efd142321c30..597cc52e9f4f0 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/AvailabilitySetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class AvailabilitySetsRestClient
+    internal partial class AvailabilitySetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailabilitySetsRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailabilitySetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailabilitySetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailabilitySetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ComputeManagementClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ComputeManagementClient.cs
index 6a11e08684ec0..637c14cb59989 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ComputeManagementClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ComputeManagementClient.cs
@@ -53,184 +53,94 @@ public ComputeManagementClient(Uri endpoint, string subscriptionId, TokenCredent
             _subscriptionId = subscriptionId;
         }
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of AvailabilitySetsClient. </summary>
-        public virtual AvailabilitySetsClient GetAvailabilitySetsClient()
-        {
-            return new AvailabilitySetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailabilitySetsOperations. </summary>
+        public virtual AvailabilitySetsOperations AvailabilitySets => new AvailabilitySetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ProximityPlacementGroupsClient. </summary>
-        public virtual ProximityPlacementGroupsClient GetProximityPlacementGroupsClient()
-        {
-            return new ProximityPlacementGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ProximityPlacementGroupsOperations. </summary>
+        public virtual ProximityPlacementGroupsOperations ProximityPlacementGroups => new ProximityPlacementGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DedicatedHostGroupsClient. </summary>
-        public virtual DedicatedHostGroupsClient GetDedicatedHostGroupsClient()
-        {
-            return new DedicatedHostGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DedicatedHostGroupsOperations. </summary>
+        public virtual DedicatedHostGroupsOperations DedicatedHostGroups => new DedicatedHostGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DedicatedHostsClient. </summary>
-        public virtual DedicatedHostsClient GetDedicatedHostsClient()
-        {
-            return new DedicatedHostsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DedicatedHostsOperations. </summary>
+        public virtual DedicatedHostsOperations DedicatedHosts => new DedicatedHostsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SshPublicKeysClient. </summary>
-        public virtual SshPublicKeysClient GetSshPublicKeysClient()
-        {
-            return new SshPublicKeysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SshPublicKeysOperations. </summary>
+        public virtual SshPublicKeysOperations SshPublicKeys => new SshPublicKeysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineExtensionImagesClient. </summary>
-        public virtual VirtualMachineExtensionImagesClient GetVirtualMachineExtensionImagesClient()
-        {
-            return new VirtualMachineExtensionImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineExtensionImagesOperations. </summary>
+        public virtual VirtualMachineExtensionImagesOperations VirtualMachineExtensionImages => new VirtualMachineExtensionImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineExtensionsClient. </summary>
-        public virtual VirtualMachineExtensionsClient GetVirtualMachineExtensionsClient()
-        {
-            return new VirtualMachineExtensionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineExtensionsOperations. </summary>
+        public virtual VirtualMachineExtensionsOperations VirtualMachineExtensions => new VirtualMachineExtensionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineImagesClient. </summary>
-        public virtual VirtualMachineImagesClient GetVirtualMachineImagesClient()
-        {
-            return new VirtualMachineImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineImagesOperations. </summary>
+        public virtual VirtualMachineImagesOperations VirtualMachineImages => new VirtualMachineImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of UsageClient. </summary>
-        public virtual UsageClient GetUsageClient()
-        {
-            return new UsageClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of UsageOperations. </summary>
+        public virtual UsageOperations Usage => new UsageOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachinesClient. </summary>
-        public virtual VirtualMachinesClient GetVirtualMachinesClient()
-        {
-            return new VirtualMachinesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachinesOperations. </summary>
+        public virtual VirtualMachinesOperations VirtualMachines => new VirtualMachinesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineSizesClient. </summary>
-        public virtual VirtualMachineSizesClient GetVirtualMachineSizesClient()
-        {
-            return new VirtualMachineSizesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineSizesOperations. </summary>
+        public virtual VirtualMachineSizesOperations VirtualMachineSizes => new VirtualMachineSizesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ImagesClient. </summary>
-        public virtual ImagesClient GetImagesClient()
-        {
-            return new ImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ImagesOperations. </summary>
+        public virtual ImagesOperations Images => new ImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetsClient. </summary>
-        public virtual VirtualMachineScaleSetsClient GetVirtualMachineScaleSetsClient()
-        {
-            return new VirtualMachineScaleSetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetsOperations. </summary>
+        public virtual VirtualMachineScaleSetsOperations VirtualMachineScaleSets => new VirtualMachineScaleSetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetExtensionsClient. </summary>
-        public virtual VirtualMachineScaleSetExtensionsClient GetVirtualMachineScaleSetExtensionsClient()
-        {
-            return new VirtualMachineScaleSetExtensionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetExtensionsOperations. </summary>
+        public virtual VirtualMachineScaleSetExtensionsOperations VirtualMachineScaleSetExtensions => new VirtualMachineScaleSetExtensionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetRollingUpgradesClient. </summary>
-        public virtual VirtualMachineScaleSetRollingUpgradesClient GetVirtualMachineScaleSetRollingUpgradesClient()
-        {
-            return new VirtualMachineScaleSetRollingUpgradesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetRollingUpgradesOperations. </summary>
+        public virtual VirtualMachineScaleSetRollingUpgradesOperations VirtualMachineScaleSetRollingUpgrades => new VirtualMachineScaleSetRollingUpgradesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetVMExtensionsClient. </summary>
-        public virtual VirtualMachineScaleSetVMExtensionsClient GetVirtualMachineScaleSetVMExtensionsClient()
-        {
-            return new VirtualMachineScaleSetVMExtensionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetVMExtensionsOperations. </summary>
+        public virtual VirtualMachineScaleSetVMExtensionsOperations VirtualMachineScaleSetVMExtensions => new VirtualMachineScaleSetVMExtensionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetVMsClient. </summary>
-        public virtual VirtualMachineScaleSetVMsClient GetVirtualMachineScaleSetVMsClient()
-        {
-            return new VirtualMachineScaleSetVMsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetVMsOperations. </summary>
+        public virtual VirtualMachineScaleSetVMsOperations VirtualMachineScaleSetVMs => new VirtualMachineScaleSetVMsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LogAnalyticsClient. </summary>
-        public virtual LogAnalyticsClient GetLogAnalyticsClient()
-        {
-            return new LogAnalyticsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LogAnalyticsOperations. </summary>
+        public virtual LogAnalyticsOperations LogAnalytics => new LogAnalyticsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineRunCommandsClient. </summary>
-        public virtual VirtualMachineRunCommandsClient GetVirtualMachineRunCommandsClient()
-        {
-            return new VirtualMachineRunCommandsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineRunCommandsOperations. </summary>
+        public virtual VirtualMachineRunCommandsOperations VirtualMachineRunCommands => new VirtualMachineRunCommandsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceSkusClient. </summary>
-        public virtual ResourceSkusClient GetResourceSkusClient()
-        {
-            return new ResourceSkusClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceSkusOperations. </summary>
+        public virtual ResourceSkusOperations ResourceSkus => new ResourceSkusOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DisksClient. </summary>
-        public virtual DisksClient GetDisksClient()
-        {
-            return new DisksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DisksOperations. </summary>
+        public virtual DisksOperations Disks => new DisksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SnapshotsClient. </summary>
-        public virtual SnapshotsClient GetSnapshotsClient()
-        {
-            return new SnapshotsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SnapshotsOperations. </summary>
+        public virtual SnapshotsOperations Snapshots => new SnapshotsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DiskEncryptionSetsClient. </summary>
-        public virtual DiskEncryptionSetsClient GetDiskEncryptionSetsClient()
-        {
-            return new DiskEncryptionSetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DiskEncryptionSetsOperations. </summary>
+        public virtual DiskEncryptionSetsOperations DiskEncryptionSets => new DiskEncryptionSetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleriesClient. </summary>
-        public virtual GalleriesClient GetGalleriesClient()
-        {
-            return new GalleriesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleriesOperations. </summary>
+        public virtual GalleriesOperations Galleries => new GalleriesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryImagesClient. </summary>
-        public virtual GalleryImagesClient GetGalleryImagesClient()
-        {
-            return new GalleryImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryImagesOperations. </summary>
+        public virtual GalleryImagesOperations GalleryImages => new GalleryImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryImageVersionsClient. </summary>
-        public virtual GalleryImageVersionsClient GetGalleryImageVersionsClient()
-        {
-            return new GalleryImageVersionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryImageVersionsOperations. </summary>
+        public virtual GalleryImageVersionsOperations GalleryImageVersions => new GalleryImageVersionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryApplicationsClient. </summary>
-        public virtual GalleryApplicationsClient GetGalleryApplicationsClient()
-        {
-            return new GalleryApplicationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryApplicationsOperations. </summary>
+        public virtual GalleryApplicationsOperations GalleryApplications => new GalleryApplicationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryApplicationVersionsClient. </summary>
-        public virtual GalleryApplicationVersionsClient GetGalleryApplicationVersionsClient()
-        {
-            return new GalleryApplicationVersionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryApplicationVersionsOperations. </summary>
+        public virtual GalleryApplicationVersionsOperations GalleryApplicationVersions => new GalleryApplicationVersionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ContainerServicesClient. </summary>
-        public virtual ContainerServicesClient GetContainerServicesClient()
-        {
-            return new ContainerServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ContainerServicesOperations. </summary>
+        public virtual ContainerServicesOperations ContainerServices => new ContainerServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesOperations.cs
index 09f30fc5ccd6b..141a464ee59e1 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The ContainerServices service client. </summary>
-    public partial class ContainerServicesClient
+    public partial class ContainerServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ContainerServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ContainerServicesClient for mocking. </summary>
-        protected ContainerServicesClient()
+        internal ContainerServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ContainerServicesOperations for mocking. </summary>
+        protected ContainerServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ContainerServicesClient. </summary>
+        /// <summary> Initializes a new instance of ContainerServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ContainerServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ContainerServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ContainerServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ContainerServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ContainerServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ContainerService>> GetAsync(string resourceGroupName, string containerServiceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ContainerService>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ContainerService> Get(string resourceGroupName, string containerServiceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual AsyncPageable<ContainerService> ListAsync(CancellationToken cance
         {
             async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -96,7 +96,7 @@ async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ContainerService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -118,7 +118,7 @@ public virtual Pageable<ContainerService> List(CancellationToken cancellationTok
         {
             Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -133,7 +133,7 @@ Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             }
             Page<ContainerService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -161,7 +161,7 @@ public virtual AsyncPageable<ContainerService> ListByResourceGroupAsync(string r
 
             async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -176,7 +176,7 @@ async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ContainerService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<ContainerService> ListByResourceGroup(string resourceGro
 
             Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             }
             Page<ContainerService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<ContainerServicesCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual ContainerServicesCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -318,7 +318,7 @@ public virtual async Task<ContainerServicesDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(containerServiceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual ContainerServicesDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(containerServiceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesRestOperations.cs
index e05ae16aa0834..38dfe99b56373 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ContainerServicesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class ContainerServicesRestClient
+    internal partial class ContainerServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ContainerServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of ContainerServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ContainerServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ContainerServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsOperations.cs
similarity index 92%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsOperations.cs
index e26a815f9cdcc..e50a0fb42a500 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The DedicatedHostGroups service client. </summary>
-    public partial class DedicatedHostGroupsClient
+    public partial class DedicatedHostGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DedicatedHostGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DedicatedHostGroupsClient for mocking. </summary>
-        protected DedicatedHostGroupsClient()
+        internal DedicatedHostGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DedicatedHostGroupsOperations for mocking. </summary>
+        protected DedicatedHostGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DedicatedHostGroupsClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DedicatedHostGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DedicatedHostGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DedicatedHostGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DedicatedHostGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DedicatedHostGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHostGroup>> CreateOrUpdateAsync(string resourceGroupName, string hostGroupName, DedicatedHostGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<DedicatedHostGroup>> CreateOrUpdateAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHostGroup> CreateOrUpdate(string resourceGroupName, string hostGroupName, DedicatedHostGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<DedicatedHostGroup> CreateOrUpdate(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHostGroup>> UpdateAsync(string resourceGroupName, string hostGroupName, DedicatedHostGroupUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<DedicatedHostGroup>> UpdateAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHostGroup> Update(string resourceGroupName, string hostGroupName, DedicatedHostGroupUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<DedicatedHostGroup> Update(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response Delete(string resourceGroupName, string hostGroupName, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHostGroup>> GetAsync(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<DedicatedHostGroup>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHostGroup> Get(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual AsyncPageable<DedicatedHostGroup> ListByResourceGroupAsync(string
 
             async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -220,7 +220,7 @@ async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DedicatedHostGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual Pageable<DedicatedHostGroup> ListByResourceGroup(string resourceG
 
             Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<DedicatedHostGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -285,7 +285,7 @@ public virtual AsyncPageable<DedicatedHostGroup> ListBySubscriptionAsync(Cancell
         {
             async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -300,7 +300,7 @@ async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DedicatedHostGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -322,7 +322,7 @@ public virtual Pageable<DedicatedHostGroup> ListBySubscription(CancellationToken
         {
             Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -337,7 +337,7 @@ Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<DedicatedHostGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsRestOperations.cs
index 883b719d60f76..94edce1e54f66 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class DedicatedHostGroupsRestClient
+    internal partial class DedicatedHostGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DedicatedHostGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DedicatedHostGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DedicatedHostGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsOperations.cs
index 2c3a128a6a88f..36dfa5c7ddb05 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The DedicatedHosts service client. </summary>
-    public partial class DedicatedHostsClient
+    public partial class DedicatedHostsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DedicatedHostsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DedicatedHostsClient for mocking. </summary>
-        protected DedicatedHostsClient()
+        internal DedicatedHostsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DedicatedHostsOperations for mocking. </summary>
+        protected DedicatedHostsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DedicatedHostsClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DedicatedHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DedicatedHostsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DedicatedHostsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DedicatedHostsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DedicatedHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHost>> GetAsync(string resourceGroupName, string hostGroupName, string hostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<DedicatedHost>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHost> Get(string resourceGroupName, string hostGroupName, string hostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<DedicatedHost> ListByHostGroupAsync(string resource
 
             async Task<Page<DedicatedHost>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<DedicatedHost>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DedicatedHost>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<DedicatedHost> ListByHostGroup(string resourceGroupName,
 
             Page<DedicatedHost> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<DedicatedHost> FirstPageFunc(int? pageSizeHint)
             }
             Page<DedicatedHost> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<DedicatedHostsCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual DedicatedHostsCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual async Task<DedicatedHostsUpdateOperation> StartUpdateAsync(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual DedicatedHostsUpdateOperation StartUpdate(string resourceGroupNam
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<DedicatedHostsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(hostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual DedicatedHostsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(hostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsRestOperations.cs
index 26a7b952923a8..9e36894833982 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DedicatedHostsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class DedicatedHostsRestClient
+    internal partial class DedicatedHostsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DedicatedHostsRestClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DedicatedHostsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DedicatedHostsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsOperations.cs
index 90ae24d33867f..27d6166d4ed97 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The DiskEncryptionSets service client. </summary>
-    public partial class DiskEncryptionSetsClient
+    public partial class DiskEncryptionSetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DiskEncryptionSetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DiskEncryptionSetsClient for mocking. </summary>
-        protected DiskEncryptionSetsClient()
+        internal DiskEncryptionSetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DiskEncryptionSetsOperations for mocking. </summary>
+        protected DiskEncryptionSetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DiskEncryptionSetsClient. </summary>
+        /// <summary> Initializes a new instance of DiskEncryptionSetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DiskEncryptionSetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DiskEncryptionSetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DiskEncryptionSetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DiskEncryptionSetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DiskEncryptionSetsClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DiskEncryptionSet>> GetAsync(string resourceGroupName, string diskEncryptionSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<DiskEncryptionSet>> GetAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DiskEncryptionSet> Get(string resourceGroupName, string diskEncryptionSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<DiskEncryptionSet> ListByResourceGroupAsync(string
 
             async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DiskEncryptionSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<DiskEncryptionSet> ListByResourceGroup(string resourceGr
 
             Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<DiskEncryptionSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<DiskEncryptionSet> ListAsync(CancellationToken canc
         {
             async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DiskEncryptionSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<DiskEncryptionSet> List(CancellationToken cancellationTo
         {
             Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<DiskEncryptionSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<DiskEncryptionSetsCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual DiskEncryptionSetsCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<DiskEncryptionSetsUpdateOperation> StartUpdateAsync(st
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual DiskEncryptionSetsUpdateOperation StartUpdate(string resourceGrou
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<DiskEncryptionSetsDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(diskEncryptionSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual DiskEncryptionSetsDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(diskEncryptionSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsRestOperations.cs
index 0223d2e5d6c43..b9c2b55ffae8b 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DiskEncryptionSetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class DiskEncryptionSetsRestClient
+    internal partial class DiskEncryptionSetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DiskEncryptionSetsRestClient. </summary>
+        /// <summary> Initializes a new instance of DiskEncryptionSetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DiskEncryptionSetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DiskEncryptionSetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksOperations.cs
index 3a92e10f1c692..21cc55c5be03f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The Disks service client. </summary>
-    public partial class DisksClient
+    public partial class DisksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DisksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DisksClient for mocking. </summary>
-        protected DisksClient()
+        internal DisksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DisksOperations for mocking. </summary>
+        protected DisksOperations()
         {
         }
-        /// <summary> Initializes a new instance of DisksClient. </summary>
+        /// <summary> Initializes a new instance of DisksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DisksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DisksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DisksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DisksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DisksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Disk>> GetAsync(string resourceGroupName, string diskName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Disk>> GetAsync(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Disk> Get(string resourceGroupName, string diskName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<Disk> ListByResourceGroupAsync(string resourceGroup
 
             async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Disk>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<Disk> ListByResourceGroup(string resourceGroupName, Canc
 
             Page<Disk> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<Disk> FirstPageFunc(int? pageSizeHint)
             }
             Page<Disk> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<Disk> ListAsync(CancellationToken cancellationToken
         {
             async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Disk>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<Disk> List(CancellationToken cancellationToken = default
         {
             Page<Disk> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<Disk> FirstPageFunc(int? pageSizeHint)
             }
             Page<Disk> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<DisksCreateOrUpdateOperation> StartCreateOrUpdateAsync
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual DisksCreateOrUpdateOperation StartCreateOrUpdate(string resourceG
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<DisksUpdateOperation> StartUpdateAsync(string resource
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual DisksUpdateOperation StartUpdate(string resourceGroupName, string
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<DisksDeleteOperation> StartDeleteAsync(string resource
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual DisksDeleteOperation StartDelete(string resourceGroupName, string
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -449,7 +449,7 @@ public virtual async Task<DisksGrantAccessOperation> StartGrantAccessAsync(strin
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -483,7 +483,7 @@ public virtual DisksGrantAccessOperation StartGrantAccess(string resourceGroupNa
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -512,7 +512,7 @@ public virtual async Task<DisksRevokeAccessOperation> StartRevokeAccessAsync(str
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartRevokeAccess");
             scope.Start();
             try
             {
@@ -541,7 +541,7 @@ public virtual DisksRevokeAccessOperation StartRevokeAccess(string resourceGroup
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartRevokeAccess");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksRestOperations.cs
index d5b47df70c38b..12ca817f8cea3 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/DisksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class DisksRestClient
+    internal partial class DisksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DisksRestClient. </summary>
+        /// <summary> Initializes a new instance of DisksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DisksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DisksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesOperations.cs
index 677e80e245638..ea7db6a6c2da0 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The Galleries service client. </summary>
-    public partial class GalleriesClient
+    public partial class GalleriesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleriesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleriesClient for mocking. </summary>
-        protected GalleriesClient()
+        internal GalleriesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleriesOperations for mocking. </summary>
+        protected GalleriesOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleriesClient. </summary>
+        /// <summary> Initializes a new instance of GalleriesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleriesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleriesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleriesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleriesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal GalleriesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Gallery>> GetAsync(string resourceGroupName, string galleryName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Gallery>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Gallery> Get(string resourceGroupName, string galleryName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<Gallery> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Gallery>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<Gallery> ListByResourceGroup(string resourceGroupName, C
 
             Page<Gallery> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<Gallery> FirstPageFunc(int? pageSizeHint)
             }
             Page<Gallery> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<Gallery> ListAsync(CancellationToken cancellationTo
         {
             async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Gallery>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<Gallery> List(CancellationToken cancellationToken = defa
         {
             Page<Gallery> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<Gallery> FirstPageFunc(int? pageSizeHint)
             }
             Page<Gallery> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<GalleriesCreateOrUpdateOperation> StartCreateOrUpdateA
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual GalleriesCreateOrUpdateOperation StartCreateOrUpdate(string resou
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<GalleriesUpdateOperation> StartUpdateAsync(string reso
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual GalleriesUpdateOperation StartUpdate(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<GalleriesDeleteOperation> StartDeleteAsync(string reso
                 throw new ArgumentNullException(nameof(galleryName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual GalleriesDeleteOperation StartDelete(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(galleryName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesRestOperations.cs
index 684484431c839..fc644358b7f1f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleriesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class GalleriesRestClient
+    internal partial class GalleriesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleriesRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleriesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleriesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleriesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsOperations.cs
index 8ed0092734443..ae119f3895656 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The GalleryApplicationVersions service client. </summary>
-    public partial class GalleryApplicationVersionsClient
+    public partial class GalleryApplicationVersionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryApplicationVersionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryApplicationVersionsClient for mocking. </summary>
-        protected GalleryApplicationVersionsClient()
+        internal GalleryApplicationVersionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryApplicationVersionsOperations for mocking. </summary>
+        protected GalleryApplicationVersionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryApplicationVersionsClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationVersionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryApplicationVersionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryApplicationVersionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryApplicationVersionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryApplicationVersionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal GalleryApplicationVersionsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryApplicationVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<GalleryApplicationVersion>> GetAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryApplicationVersion> Get(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<GalleryApplicationVersion> ListByGalleryApplication
 
             async Task<Page<GalleryApplicationVersion>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<GalleryApplicationVersion>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryApplicationVersion>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<GalleryApplicationVersion> ListByGalleryApplication(stri
 
             Page<GalleryApplicationVersion> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<GalleryApplicationVersion> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryApplicationVersion> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ public virtual async Task<GalleryApplicationVersionsCreateOrUpdateOperation> Sta
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -259,7 +259,7 @@ public virtual GalleryApplicationVersionsCreateOrUpdateOperation StartCreateOrUp
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -303,7 +303,7 @@ public virtual async Task<GalleryApplicationVersionsUpdateOperation> StartUpdate
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual GalleryApplicationVersionsUpdateOperation StartUpdate(string reso
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<GalleryApplicationVersionsDeleteOperation> StartDelete
                 throw new ArgumentNullException(nameof(galleryApplicationVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -425,7 +425,7 @@ public virtual GalleryApplicationVersionsDeleteOperation StartDelete(string reso
                 throw new ArgumentNullException(nameof(galleryApplicationVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsRestOperations.cs
index 73ba675f33b16..e657232daa50b 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationVersionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class GalleryApplicationVersionsRestClient
+    internal partial class GalleryApplicationVersionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryApplicationVersionsRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationVersionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryApplicationVersionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryApplicationVersionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsOperations.cs
index e12c7ebd0fc77..672214c776e50 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The GalleryApplications service client. </summary>
-    public partial class GalleryApplicationsClient
+    public partial class GalleryApplicationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryApplicationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryApplicationsClient for mocking. </summary>
-        protected GalleryApplicationsClient()
+        internal GalleryApplicationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryApplicationsOperations for mocking. </summary>
+        protected GalleryApplicationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryApplicationsClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryApplicationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryApplicationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryApplicationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal GalleryApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryApplication>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<GalleryApplication>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryApplication> Get(string resourceGroupName, string galleryName, string galleryApplicationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<GalleryApplication> ListByGalleryAsync(string resou
 
             async Task<Page<GalleryApplication>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<GalleryApplication>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryApplication>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<GalleryApplication> ListByGallery(string resourceGroupNa
 
             Page<GalleryApplication> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<GalleryApplication> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryApplication> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<GalleryApplicationsCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual GalleryApplicationsCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual async Task<GalleryApplicationsUpdateOperation> StartUpdateAsync(s
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual GalleryApplicationsUpdateOperation StartUpdate(string resourceGro
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<GalleryApplicationsDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(galleryApplicationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual GalleryApplicationsDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(galleryApplicationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsRestOperations.cs
index 75f643fa91dc5..eda87cb4a8cca 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryApplicationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class GalleryApplicationsRestClient
+    internal partial class GalleryApplicationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryApplicationsRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryApplicationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryApplicationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsOperations.cs
index bfaa51d44d540..6581ff7926b6e 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The GalleryImageVersions service client. </summary>
-    public partial class GalleryImageVersionsClient
+    public partial class GalleryImageVersionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryImageVersionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryImageVersionsClient for mocking. </summary>
-        protected GalleryImageVersionsClient()
+        internal GalleryImageVersionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryImageVersionsOperations for mocking. </summary>
+        protected GalleryImageVersionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryImageVersionsClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImageVersionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryImageVersionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryImageVersionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryImageVersionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryImageVersionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal GalleryImageVersionsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryImageVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<GalleryImageVersion>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryImageVersion> Get(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<GalleryImageVersion> ListByGalleryImageAsync(string
 
             async Task<Page<GalleryImageVersion>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<GalleryImageVersion>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryImageVersion>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<GalleryImageVersion> ListByGalleryImage(string resourceG
 
             Page<GalleryImageVersion> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<GalleryImageVersion> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryImageVersion> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ public virtual async Task<GalleryImageVersionsCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -259,7 +259,7 @@ public virtual GalleryImageVersionsCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -303,7 +303,7 @@ public virtual async Task<GalleryImageVersionsUpdateOperation> StartUpdateAsync(
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual GalleryImageVersionsUpdateOperation StartUpdate(string resourceGr
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<GalleryImageVersionsDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(galleryImageVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -425,7 +425,7 @@ public virtual GalleryImageVersionsDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(galleryImageVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsRestOperations.cs
index 60bb2de4fb258..aa5b71cd4b33f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImageVersionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class GalleryImageVersionsRestClient
+    internal partial class GalleryImageVersionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryImageVersionsRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImageVersionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryImageVersionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryImageVersionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesOperations.cs
index ff91f5666915f..ca201abc33f4f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The GalleryImages service client. </summary>
-    public partial class GalleryImagesClient
+    public partial class GalleryImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryImagesClient for mocking. </summary>
-        protected GalleryImagesClient()
+        internal GalleryImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryImagesOperations for mocking. </summary>
+        protected GalleryImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryImagesClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal GalleryImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryImage>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<GalleryImage>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryImage> Get(string resourceGroupName, string galleryName, string galleryImageName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<GalleryImage> ListByGalleryAsync(string resourceGro
 
             async Task<Page<GalleryImage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<GalleryImage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryImage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<GalleryImage> ListByGallery(string resourceGroupName, st
 
             Page<GalleryImage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<GalleryImage> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryImage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<GalleryImagesCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual GalleryImagesCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual async Task<GalleryImagesUpdateOperation> StartUpdateAsync(string
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual GalleryImagesUpdateOperation StartUpdate(string resourceGroupName
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<GalleryImagesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(galleryImageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual GalleryImagesDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(galleryImageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesRestOperations.cs
index 5cba5e8932afa..1d4ad2ec82551 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/GalleryImagesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class GalleryImagesRestClient
+    internal partial class GalleryImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesOperations.cs
index 795e118a31bbc..ad75967f1156d 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The Images service client. </summary>
-    public partial class ImagesClient
+    public partial class ImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ImagesClient for mocking. </summary>
-        protected ImagesClient()
+        internal ImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ImagesOperations for mocking. </summary>
+        protected ImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ImagesClient. </summary>
+        /// <summary> Initializes a new instance of ImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Image>> GetAsync(string resourceGroupName, string imageName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<Image>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Image> Get(string resourceGroupName, string imageName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<Image> ListByResourceGroupAsync(string resourceGrou
 
             async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Image>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<Image> ListByResourceGroup(string resourceGroupName, Can
 
             Page<Image> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<Image> FirstPageFunc(int? pageSizeHint)
             }
             Page<Image> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<Image> ListAsync(CancellationToken cancellationToke
         {
             async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Image>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<Image> List(CancellationToken cancellationToken = defaul
         {
             Page<Image> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<Image> FirstPageFunc(int? pageSizeHint)
             }
             Page<Image> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -257,7 +257,7 @@ public virtual async Task<ImagesCreateOrUpdateOperation> StartCreateOrUpdateAsyn
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -291,7 +291,7 @@ public virtual ImagesCreateOrUpdateOperation StartCreateOrUpdate(string resource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -325,7 +325,7 @@ public virtual async Task<ImagesUpdateOperation> StartUpdateAsync(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -359,7 +359,7 @@ public virtual ImagesUpdateOperation StartUpdate(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -388,7 +388,7 @@ public virtual async Task<ImagesDeleteOperation> StartDeleteAsync(string resourc
                 throw new ArgumentNullException(nameof(imageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -417,7 +417,7 @@ public virtual ImagesDeleteOperation StartDelete(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(imageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesRestOperations.cs
index 1f3fafd986e82..bca0cb57dfd36 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ImagesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class ImagesRestClient
+    internal partial class ImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of ImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsOperations.cs
similarity index 91%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsOperations.cs
index 909dbfc3987d5..6be840939a289 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsOperations.cs
@@ -14,23 +14,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The LogAnalytics service client. </summary>
-    public partial class LogAnalyticsClient
+    public partial class LogAnalyticsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LogAnalyticsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LogAnalyticsClient for mocking. </summary>
-        protected LogAnalyticsClient()
+        internal LogAnalyticsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LogAnalyticsOperations for mocking. </summary>
+        protected LogAnalyticsOperations()
         {
         }
-        /// <summary> Initializes a new instance of LogAnalyticsClient. </summary>
+        /// <summary> Initializes a new instance of LogAnalyticsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LogAnalyticsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LogAnalyticsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LogAnalyticsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LogAnalyticsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -50,7 +50,7 @@ public virtual async Task<LogAnalyticsExportRequestRateByIntervalOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportRequestRateByInterval");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportRequestRateByInterval");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual LogAnalyticsExportRequestRateByIntervalOperation StartExportReque
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportRequestRateByInterval");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportRequestRateByInterval");
             scope.Start();
             try
             {
@@ -108,7 +108,7 @@ public virtual async Task<LogAnalyticsExportThrottledRequestsOperation> StartExp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportThrottledRequests");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportThrottledRequests");
             scope.Start();
             try
             {
@@ -137,7 +137,7 @@ public virtual LogAnalyticsExportThrottledRequestsOperation StartExportThrottled
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportThrottledRequests");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportThrottledRequests");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsRestOperations.cs
similarity index 97%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsRestOperations.cs
index 9c7ed02d34146..3d34283a16640 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/LogAnalyticsRestOperations.cs
@@ -15,20 +15,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class LogAnalyticsRestClient
+    internal partial class LogAnalyticsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LogAnalyticsRestClient. </summary>
+        /// <summary> Initializes a new instance of LogAnalyticsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LogAnalyticsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LogAnalyticsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/OperationsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Operations.cs
similarity index 81%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/OperationsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/Operations.cs
index a667ebae71b68..ed3f859bf0559 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/OperationsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/Operations.cs
@@ -15,23 +15,23 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<ComputeOperationValue> ListAsync(CancellationToken
         {
             async Task<Page<ComputeOperationValue>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ public virtual Pageable<ComputeOperationValue> List(CancellationToken cancellati
         {
             Page<ComputeOperationValue> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsOperations.cs
similarity index 92%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsOperations.cs
index b0baeac5a3cb7..190b3832ad15b 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The ProximityPlacementGroups service client. </summary>
-    public partial class ProximityPlacementGroupsClient
+    public partial class ProximityPlacementGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ProximityPlacementGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ProximityPlacementGroupsClient for mocking. </summary>
-        protected ProximityPlacementGroupsClient()
+        internal ProximityPlacementGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ProximityPlacementGroupsOperations for mocking. </summary>
+        protected ProximityPlacementGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ProximityPlacementGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ProximityPlacementGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ProximityPlacementGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ProximityPlacementGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ProximityPlacementGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ProximityPlacementGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ProximityPlacementGroupsClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ProximityPlacementGroup>> CreateOrUpdateAsync(string resourceGroupName, string proximityPlacementGroupName, ProximityPlacementGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ProximityPlacementGroup>> CreateOrUpdateAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ProximityPlacementGroup> CreateOrUpdate(string resourceGroupName, string proximityPlacementGroupName, ProximityPlacementGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<ProximityPlacementGroup> CreateOrUpdate(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ProximityPlacementGroup>> UpdateAsync(string resourceGroupName, string proximityPlacementGroupName, UpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<ProximityPlacementGroup>> UpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ProximityPlacementGroup> Update(string resourceGroupName, string proximityPlacementGroupName, UpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<ProximityPlacementGroup> Update(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string proximityPlacementGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string proximityPlacementGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -162,7 +162,7 @@ public virtual Response Delete(string resourceGroupName, string proximityPlaceme
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ProximityPlacementGroup>> GetAsync(string resourceGroupName, string proximityPlacementGroupName, string includeColocationStatus = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -182,7 +182,7 @@ public virtual async Task<Response<ProximityPlacementGroup>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ProximityPlacementGroup> Get(string resourceGroupName, string proximityPlacementGroupName, string includeColocationStatus = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<ProximityPlacementGroup> ListBySubscriptionAsync(Ca
         {
             async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ProximityPlacementGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -238,7 +238,7 @@ public virtual Pageable<ProximityPlacementGroup> ListBySubscription(Cancellation
         {
             Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -253,7 +253,7 @@ Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ProximityPlacementGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -281,7 +281,7 @@ public virtual AsyncPageable<ProximityPlacementGroup> ListByResourceGroupAsync(s
 
             async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -296,7 +296,7 @@ async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ProximityPlacementGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -324,7 +324,7 @@ public virtual Pageable<ProximityPlacementGroup> ListByResourceGroup(string reso
 
             Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -339,7 +339,7 @@ Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ProximityPlacementGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsRestOperations.cs
index e93841b171dd8..7fc3016f2abaf 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ProximityPlacementGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class ProximityPlacementGroupsRestClient
+    internal partial class ProximityPlacementGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ProximityPlacementGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ProximityPlacementGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ProximityPlacementGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ProximityPlacementGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusOperations.cs
similarity index 88%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusOperations.cs
index 22c96a71f2fbd..4c7c9e0ae10ed 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The ResourceSkus service client. </summary>
-    public partial class ResourceSkusClient
+    public partial class ResourceSkusOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceSkusRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceSkusClient for mocking. </summary>
-        protected ResourceSkusClient()
+        internal ResourceSkusRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceSkusOperations for mocking. </summary>
+        protected ResourceSkusOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceSkusClient. </summary>
+        /// <summary> Initializes a new instance of ResourceSkusOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourceSkusClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourceSkusOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourceSkusRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourceSkusRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ public virtual AsyncPageable<ResourceSku> ListAsync(string filter = null, Cancel
         {
             async Task<Page<ResourceSku>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -59,7 +59,7 @@ async Task<Page<ResourceSku>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ResourceSku>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -82,7 +82,7 @@ public virtual Pageable<ResourceSku> List(string filter = null, CancellationToke
         {
             Page<ResourceSku> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -97,7 +97,7 @@ Page<ResourceSku> FirstPageFunc(int? pageSizeHint)
             }
             Page<ResourceSku> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusRestOperations.cs
similarity index 97%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusRestOperations.cs
index c2c933ea4816b..d20bd6aa0e03e 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/ResourceSkusRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class ResourceSkusRestClient
+    internal partial class ResourceSkusRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceSkusRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceSkusRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceSkusRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourceSkusRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/OperationsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/RestOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/OperationsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/RestOperations.cs
index b13b7736baa4f..6555e9a4b5a46 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/OperationsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/RestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsOperations.cs
index 7a2007528a19f..b0215290a46b8 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The Snapshots service client. </summary>
-    public partial class SnapshotsClient
+    public partial class SnapshotsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SnapshotsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SnapshotsClient for mocking. </summary>
-        protected SnapshotsClient()
+        internal SnapshotsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SnapshotsOperations for mocking. </summary>
+        protected SnapshotsOperations()
         {
         }
-        /// <summary> Initializes a new instance of SnapshotsClient. </summary>
+        /// <summary> Initializes a new instance of SnapshotsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SnapshotsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SnapshotsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SnapshotsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SnapshotsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal SnapshotsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Snapshot>> GetAsync(string resourceGroupName, string snapshotName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Snapshot>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Snapshot> Get(string resourceGroupName, string snapshotName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<Snapshot> ListByResourceGroupAsync(string resourceG
 
             async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Snapshot>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<Snapshot> ListByResourceGroup(string resourceGroupName,
 
             Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             }
             Page<Snapshot> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<Snapshot> ListAsync(CancellationToken cancellationT
         {
             async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Snapshot>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<Snapshot> List(CancellationToken cancellationToken = def
         {
             Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             }
             Page<Snapshot> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<SnapshotsCreateOrUpdateOperation> StartCreateOrUpdateA
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual SnapshotsCreateOrUpdateOperation StartCreateOrUpdate(string resou
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<SnapshotsUpdateOperation> StartUpdateAsync(string reso
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual SnapshotsUpdateOperation StartUpdate(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<SnapshotsDeleteOperation> StartDeleteAsync(string reso
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual SnapshotsDeleteOperation StartDelete(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -449,7 +449,7 @@ public virtual async Task<SnapshotsGrantAccessOperation> StartGrantAccessAsync(s
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -483,7 +483,7 @@ public virtual SnapshotsGrantAccessOperation StartGrantAccess(string resourceGro
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -512,7 +512,7 @@ public virtual async Task<SnapshotsRevokeAccessOperation> StartRevokeAccessAsync
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartRevokeAccess");
             scope.Start();
             try
             {
@@ -541,7 +541,7 @@ public virtual SnapshotsRevokeAccessOperation StartRevokeAccess(string resourceG
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartRevokeAccess");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsRestOperations.cs
index af2d9babc2760..1b065f5b2fb24 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SnapshotsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class SnapshotsRestClient
+    internal partial class SnapshotsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SnapshotsRestClient. </summary>
+        /// <summary> Initializes a new instance of SnapshotsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SnapshotsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SnapshotsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysOperations.cs
similarity index 93%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysOperations.cs
index ca27d2adf2822..153688b642681 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The SshPublicKeys service client. </summary>
-    public partial class SshPublicKeysClient
+    public partial class SshPublicKeysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SshPublicKeysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SshPublicKeysClient for mocking. </summary>
-        protected SshPublicKeysClient()
+        internal SshPublicKeysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SshPublicKeysOperations for mocking. </summary>
+        protected SshPublicKeysOperations()
         {
         }
-        /// <summary> Initializes a new instance of SshPublicKeysClient. </summary>
+        /// <summary> Initializes a new instance of SshPublicKeysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SshPublicKeysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SshPublicKeysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SshPublicKeysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SshPublicKeysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal SshPublicKeysClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyResource>> CreateAsync(string resourceGroupName, string sshPublicKeyName, SshPublicKeyResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Create");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<SshPublicKeyResource>> CreateAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyResource> Create(string resourceGroupName, string sshPublicKeyName, SshPublicKeyResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Create");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<SshPublicKeyResource> Create(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyResource>> UpdateAsync(string resourceGroupName, string sshPublicKeyName, SshPublicKeyUpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<SshPublicKeyResource>> UpdateAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyResource> Update(string resourceGroupName, string sshPublicKeyName, SshPublicKeyUpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<SshPublicKeyResource> Update(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Delete");
             scope.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response Delete(string resourceGroupName, string sshPublicKeyName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyResource>> GetAsync(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Get");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<SshPublicKeyResource>> GetAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyResource> Get(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Get");
             scope.Start();
             try
             {
@@ -199,7 +199,7 @@ public virtual Response<SshPublicKeyResource> Get(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyGenerateKeyPairResult>> GenerateKeyPairAsync(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.GenerateKeyPair");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.GenerateKeyPair");
             scope.Start();
             try
             {
@@ -218,7 +218,7 @@ public virtual async Task<Response<SshPublicKeyGenerateKeyPairResult>> GenerateK
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyGenerateKeyPairResult> GenerateKeyPair(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.GenerateKeyPair");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.GenerateKeyPair");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual AsyncPageable<SshPublicKeyResource> ListBySubscriptionAsync(Cance
         {
             async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SshPublicKeyResource>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -274,7 +274,7 @@ public virtual Pageable<SshPublicKeyResource> ListBySubscription(CancellationTok
         {
             Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -289,7 +289,7 @@ Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             }
             Page<SshPublicKeyResource> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -317,7 +317,7 @@ public virtual AsyncPageable<SshPublicKeyResource> ListByResourceGroupAsync(stri
 
             async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -332,7 +332,7 @@ async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SshPublicKeyResource>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -360,7 +360,7 @@ public virtual Pageable<SshPublicKeyResource> ListByResourceGroup(string resourc
 
             Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -375,7 +375,7 @@ Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             }
             Page<SshPublicKeyResource> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysRestOperations.cs
index eceb1d7bf3a59..d0a203fbb5bf7 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/SshPublicKeysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class SshPublicKeysRestClient
+    internal partial class SshPublicKeysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SshPublicKeysRestClient. </summary>
+        /// <summary> Initializes a new instance of SshPublicKeysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SshPublicKeysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SshPublicKeysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageOperations.cs
similarity index 88%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageOperations.cs
index 28320edf0ea82..7ad25ec8ad00f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The Usage service client. </summary>
-    public partial class UsageClient
+    public partial class UsageOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsageRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsageClient for mocking. </summary>
-        protected UsageClient()
+        internal UsageRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsageOperations for mocking. </summary>
+        protected UsageOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsageClient. </summary>
+        /// <summary> Initializes a new instance of UsageOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal UsageClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal UsageOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new UsageRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new UsageRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<Usage> ListAsync(string location, CancellationToken
 
             async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Usage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<Usage> List(string location, CancellationToken cancellat
 
             Page<Usage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<Usage> FirstPageFunc(int? pageSizeHint)
             }
             Page<Usage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageRestOperations.cs
similarity index 97%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageRestOperations.cs
index fa02cad556eaf..6b298c9188637 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/UsageRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class UsageRestClient
+    internal partial class UsageRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsageRestClient. </summary>
+        /// <summary> Initializes a new instance of UsageRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsageRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public UsageRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesOperations.cs
similarity index 89%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesOperations.cs
index 69835af321f98..22533841e7f92 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineExtensionImages service client. </summary>
-    public partial class VirtualMachineExtensionImagesClient
+    public partial class VirtualMachineExtensionImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineExtensionImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesClient for mocking. </summary>
-        protected VirtualMachineExtensionImagesClient()
+        internal VirtualMachineExtensionImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesOperations for mocking. </summary>
+        protected VirtualMachineExtensionImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineExtensionImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineExtensionImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineExtensionImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineExtensionImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VirtualMachineExtensionImagesClient(ClientDiagnostics clientDiagnostics
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtensionImage>> GetAsync(string location, string publisherName, string type, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<VirtualMachineExtensionImage>> GetAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtensionImage> Get(string location, string publisherName, string type, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<VirtualMachineExtensionImage> Get(string location, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>> ListTypesAsync(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListTypes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListTypes");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineExtensionImage>> ListTypes(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListTypes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListTypes");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<IReadOnlyList<VirtualMachineExtensionImage>> ListTypes(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>> ListVersionsAsync(string location, string publisherName, string type, string filter = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListVersions");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListVersions");
             scope.Start();
             try
             {
@@ -150,7 +150,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineExtensionImage>> ListVersions(string location, string publisherName, string type, string filter = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListVersions");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListVersions");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesRestOperations.cs
similarity index 98%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesRestOperations.cs
index b935bfba60a83..185f272cefaa0 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionImagesRestOperations.cs
@@ -17,20 +17,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineExtensionImagesRestClient
+    internal partial class VirtualMachineExtensionImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineExtensionImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineExtensionImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsOperations.cs
index ee9bcd2de665c..40feaf531c380 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineExtensions service client. </summary>
-    public partial class VirtualMachineExtensionsClient
+    public partial class VirtualMachineExtensionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineExtensionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionsClient for mocking. </summary>
-        protected VirtualMachineExtensionsClient()
+        internal VirtualMachineExtensionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineExtensionsOperations for mocking. </summary>
+        protected VirtualMachineExtensionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineExtensionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineExtensionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineExtensionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineExtensionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualMachineExtensionsClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -105,7 +105,7 @@ public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -143,7 +143,7 @@ public virtual async Task<VirtualMachineExtensionsCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -182,7 +182,7 @@ public virtual VirtualMachineExtensionsCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -221,7 +221,7 @@ public virtual async Task<VirtualMachineExtensionsUpdateOperation> StartUpdateAs
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -260,7 +260,7 @@ public virtual VirtualMachineExtensionsUpdateOperation StartUpdate(string resour
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -294,7 +294,7 @@ public virtual async Task<VirtualMachineExtensionsDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -328,7 +328,7 @@ public virtual VirtualMachineExtensionsDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsRestOperations.cs
index 55006b09ef3ed..d81aac4aedeec 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineExtensionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineExtensionsRestClient
+    internal partial class VirtualMachineExtensionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineExtensionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineExtensionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineExtensionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesOperations.cs
similarity index 92%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesOperations.cs
index 9d3d88249395f..67756ffdb0122 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineImages service client. </summary>
-    public partial class VirtualMachineImagesClient
+    public partial class VirtualMachineImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineImagesClient for mocking. </summary>
-        protected VirtualMachineImagesClient()
+        internal VirtualMachineImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineImagesOperations for mocking. </summary>
+        protected VirtualMachineImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineImagesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal VirtualMachineImagesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineImage>> GetAsync(string location, string publisherName, string offer, string skus, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.Get");
             scope.Start();
             try
             {
@@ -68,7 +68,7 @@ public virtual async Task<Response<VirtualMachineImage>> GetAsync(string locatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineImage> Get(string location, string publisherName, string offer, string skus, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.Get");
             scope.Start();
             try
             {
@@ -92,7 +92,7 @@ public virtual Response<VirtualMachineImage> Get(string location, string publish
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListAsync(string location, string publisherName, string offer, string skus, string expand = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.List");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> List(string location, string publisherName, string offer, string skus, string expand = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.List");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual Response<IReadOnlyList<VirtualMachineImageResource>> List(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListOffersAsync(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListOffers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListOffers");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListOffers(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListOffers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListOffers");
             scope.Start();
             try
             {
@@ -172,7 +172,7 @@ public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListOffers(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListPublishersAsync(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListPublishers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListPublishers");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListPublishers(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListPublishers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListPublishers");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListPublishe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListSkusAsync(string location, string publisherName, string offer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListSkus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListSkus");
             scope.Start();
             try
             {
@@ -230,7 +230,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListSkus(string location, string publisherName, string offer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListSkus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListSkus");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesRestOperations.cs
index 8e2bcacc5496d..4b628602bcc9d 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineImagesRestOperations.cs
@@ -17,20 +17,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineImagesRestClient
+    internal partial class VirtualMachineImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsOperations.cs
similarity index 89%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsOperations.cs
index 725184fa31795..9af46ff42148d 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineRunCommands service client. </summary>
-    public partial class VirtualMachineRunCommandsClient
+    public partial class VirtualMachineRunCommandsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineRunCommandsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineRunCommandsClient for mocking. </summary>
-        protected VirtualMachineRunCommandsClient()
+        internal VirtualMachineRunCommandsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineRunCommandsOperations for mocking. </summary>
+        protected VirtualMachineRunCommandsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineRunCommandsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineRunCommandsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineRunCommandsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineRunCommandsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineRunCommandsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineRunCommandsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualMachineRunCommandsClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RunCommandDocument>> GetAsync(string location, string commandId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<RunCommandDocument>> GetAsync(string location
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RunCommandDocument> Get(string location, string commandId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<RunCommandDocumentBase> ListAsync(string location,
 
             async Task<Page<RunCommandDocumentBase>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<RunCommandDocumentBase>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RunCommandDocumentBase>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<RunCommandDocumentBase> List(string location, Cancellati
 
             Page<RunCommandDocumentBase> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<RunCommandDocumentBase> FirstPageFunc(int? pageSizeHint)
             }
             Page<RunCommandDocumentBase> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsRestOperations.cs
similarity index 98%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsRestOperations.cs
index 55bfe11e7409a..edee214237be8 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineRunCommandsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineRunCommandsRestClient
+    internal partial class VirtualMachineRunCommandsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineRunCommandsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineRunCommandsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineRunCommandsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineRunCommandsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsOperations.cs
index e722a8f336ed8..37d171595553e 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineScaleSetExtensions service client. </summary>
-    public partial class VirtualMachineScaleSetExtensionsClient
+    public partial class VirtualMachineScaleSetExtensionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetExtensionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsClient for mocking. </summary>
-        protected VirtualMachineScaleSetExtensionsClient()
+        internal VirtualMachineScaleSetExtensionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetExtensionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetExtensionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetExtensionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetExtensionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetExtensionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VirtualMachineScaleSetExtensionsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<VirtualMachineScaleSetExtension>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetExtension> Get(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<VirtualMachineScaleSetExtension> ListAsync(string r
 
             async Task<Page<VirtualMachineScaleSetExtension>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<VirtualMachineScaleSetExtension>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<VirtualMachineScaleSetExtension>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ public virtual Pageable<VirtualMachineScaleSetExtension> List(string resourceGro
 
             Page<VirtualMachineScaleSetExtension> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -159,7 +159,7 @@ Page<VirtualMachineScaleSetExtension> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSetExtension> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -200,7 +200,7 @@ public virtual async Task<VirtualMachineScaleSetExtensionsCreateOrUpdateOperatio
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -239,7 +239,7 @@ public virtual VirtualMachineScaleSetExtensionsCreateOrUpdateOperation StartCrea
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -278,7 +278,7 @@ public virtual async Task<VirtualMachineScaleSetExtensionsUpdateOperation> Start
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual VirtualMachineScaleSetExtensionsUpdateOperation StartUpdate(strin
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -351,7 +351,7 @@ public virtual async Task<VirtualMachineScaleSetExtensionsDeleteOperation> Start
                 throw new ArgumentNullException(nameof(vmssExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual VirtualMachineScaleSetExtensionsDeleteOperation StartDelete(strin
                 throw new ArgumentNullException(nameof(vmssExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsRestOperations.cs
index 0fa35a7b0f902..d7e9a46dbb12e 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetExtensionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineScaleSetExtensionsRestClient
+    internal partial class VirtualMachineScaleSetExtensionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetExtensionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetExtensionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesOperations.cs
similarity index 91%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesOperations.cs
index 99882cba6e6b9..b70754a70dc94 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineScaleSetRollingUpgrades service client. </summary>
-    public partial class VirtualMachineScaleSetRollingUpgradesClient
+    public partial class VirtualMachineScaleSetRollingUpgradesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetRollingUpgradesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesClient for mocking. </summary>
-        protected VirtualMachineScaleSetRollingUpgradesClient()
+        internal VirtualMachineScaleSetRollingUpgradesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesOperations for mocking. </summary>
+        protected VirtualMachineScaleSetRollingUpgradesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetRollingUpgradesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetRollingUpgradesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetRollingUpgradesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetRollingUpgradesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal VirtualMachineScaleSetRollingUpgradesClient(ClientDiagnostics clientDia
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RollingUpgradeStatusInfo>> GetLatestAsync(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.GetLatest");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.GetLatest");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<RollingUpgradeStatusInfo>> GetLatestAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RollingUpgradeStatusInfo> GetLatest(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.GetLatest");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.GetLatest");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual async Task<VirtualMachineScaleSetRollingUpgradesCancelOperation>
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartCancel");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartCancel");
             scope.Start();
             try
             {
@@ -118,7 +118,7 @@ public virtual VirtualMachineScaleSetRollingUpgradesCancelOperation StartCancel(
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartCancel");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartCancel");
             scope.Start();
             try
             {
@@ -147,7 +147,7 @@ public virtual async Task<VirtualMachineScaleSetRollingUpgradesStartOSUpgradeOpe
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartOSUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartOSUpgrade");
             scope.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual VirtualMachineScaleSetRollingUpgradesStartOSUpgradeOperation Star
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartOSUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartOSUpgrade");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual async Task<VirtualMachineScaleSetRollingUpgradesStartExtensionUpg
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartExtensionUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartExtensionUpgrade");
             scope.Start();
             try
             {
@@ -234,7 +234,7 @@ public virtual VirtualMachineScaleSetRollingUpgradesStartExtensionUpgradeOperati
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartExtensionUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartExtensionUpgrade");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesRestOperations.cs
similarity index 98%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesRestOperations.cs
index fd55290112187..b23a1b2b82ce7 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetRollingUpgradesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineScaleSetRollingUpgradesRestClient
+    internal partial class VirtualMachineScaleSetRollingUpgradesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetRollingUpgradesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetRollingUpgradesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsOperations.cs
similarity index 94%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsOperations.cs
index f29f72dfcb969..de702866252b1 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineScaleSetVMExtensions service client. </summary>
-    public partial class VirtualMachineScaleSetVMExtensionsClient
+    public partial class VirtualMachineScaleSetVMExtensionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetVMExtensionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsClient for mocking. </summary>
-        protected VirtualMachineScaleSetVMExtensionsClient()
+        internal VirtualMachineScaleSetVMExtensionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetVMExtensionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetVMExtensionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetVMExtensionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetVMExtensionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetVMExtensionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VirtualMachineScaleSetVMExtensionsClient(ClientDiagnostics clientDiagno
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmScaleSetName, string instanceId, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual async Task<VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperat
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -196,7 +196,7 @@ public virtual VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation StartCr
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -240,7 +240,7 @@ public virtual async Task<VirtualMachineScaleSetVMExtensionsUpdateOperation> Sta
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -284,7 +284,7 @@ public virtual VirtualMachineScaleSetVMExtensionsUpdateOperation StartUpdate(str
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<VirtualMachineScaleSetVMExtensionsDeleteOperation> Sta
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -362,7 +362,7 @@ public virtual VirtualMachineScaleSetVMExtensionsDeleteOperation StartDelete(str
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsRestOperations.cs
index 0228e0019dbbe..332ca91fbb581 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMExtensionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineScaleSetVMExtensionsRestClient
+    internal partial class VirtualMachineScaleSetVMExtensionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetVMExtensionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetVMExtensionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs
similarity index 96%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs
index 4008713d53a76..f402b7f4d379f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineScaleSetVMs service client. </summary>
-    public partial class VirtualMachineScaleSetVMsClient
+    public partial class VirtualMachineScaleSetVMsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetVMsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsClient for mocking. </summary>
-        protected VirtualMachineScaleSetVMsClient()
+        internal VirtualMachineScaleSetVMsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetVMsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetVMsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetVMsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetVMsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetVMsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualMachineScaleSetVMsClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetVM>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualMachineScaleSetVM>> GetAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetVM> Get(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<VirtualMachineScaleSetVM> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetVMInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<VirtualMachineScaleSetVMInstanceView>> GetIns
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetVMInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -124,7 +124,7 @@ public virtual Response<VirtualMachineScaleSetVMInstanceView> GetInstanceView(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -144,7 +144,7 @@ public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response SimulateEviction(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -177,7 +177,7 @@ public virtual AsyncPageable<VirtualMachineScaleSetVM> ListAsync(string resource
 
             async Task<Page<VirtualMachineScaleSetVM>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -192,7 +192,7 @@ async Task<Page<VirtualMachineScaleSetVM>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSetVM>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -228,7 +228,7 @@ public virtual Pageable<VirtualMachineScaleSetVM> List(string resourceGroupName,
 
             Page<VirtualMachineScaleSetVM> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -243,7 +243,7 @@ Page<VirtualMachineScaleSetVM> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSetVM> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -280,7 +280,7 @@ public virtual async Task<VirtualMachineScaleSetVMsReimageOperation> StartReimag
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual VirtualMachineScaleSetVMsReimageOperation StartReimage(string res
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<VirtualMachineScaleSetVMsReimageAllOperation> StartRei
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual VirtualMachineScaleSetVMsReimageAllOperation StartReimageAll(stri
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -417,7 +417,7 @@ public virtual async Task<VirtualMachineScaleSetVMsDeallocateOperation> StartDea
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -451,7 +451,7 @@ public virtual VirtualMachineScaleSetVMsDeallocateOperation StartDeallocate(stri
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -490,7 +490,7 @@ public virtual async Task<VirtualMachineScaleSetVMsUpdateOperation> StartUpdateA
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -529,7 +529,7 @@ public virtual VirtualMachineScaleSetVMsUpdateOperation StartUpdate(string resou
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -563,7 +563,7 @@ public virtual async Task<VirtualMachineScaleSetVMsDeleteOperation> StartDeleteA
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -597,7 +597,7 @@ public virtual VirtualMachineScaleSetVMsDeleteOperation StartDelete(string resou
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -632,7 +632,7 @@ public virtual async Task<VirtualMachineScaleSetVMsPowerOffOperation> StartPower
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual VirtualMachineScaleSetVMsPowerOffOperation StartPowerOff(string r
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -701,7 +701,7 @@ public virtual async Task<VirtualMachineScaleSetVMsRestartOperation> StartRestar
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -735,7 +735,7 @@ public virtual VirtualMachineScaleSetVMsRestartOperation StartRestart(string res
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -769,7 +769,7 @@ public virtual async Task<VirtualMachineScaleSetVMsStartOperation> StartStartAsy
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartStart");
             scope.Start();
             try
             {
@@ -803,7 +803,7 @@ public virtual VirtualMachineScaleSetVMsStartOperation StartStart(string resourc
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartStart");
             scope.Start();
             try
             {
@@ -837,7 +837,7 @@ public virtual async Task<VirtualMachineScaleSetVMsRedeployOperation> StartRedep
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -871,7 +871,7 @@ public virtual VirtualMachineScaleSetVMsRedeployOperation StartRedeploy(string r
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -905,7 +905,7 @@ public virtual async Task<VirtualMachineScaleSetVMsPerformMaintenanceOperation>
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -939,7 +939,7 @@ public virtual VirtualMachineScaleSetVMsPerformMaintenanceOperation StartPerform
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -978,7 +978,7 @@ public virtual async Task<VirtualMachineScaleSetVMsRunCommandOperation> StartRun
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRunCommand");
             scope.Start();
             try
             {
@@ -1017,7 +1017,7 @@ public virtual VirtualMachineScaleSetVMsRunCommandOperation StartRunCommand(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRunCommand");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsRestOperations.cs
index 322288db3efa2..2de01819eab8c 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetVMsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineScaleSetVMsRestClient
+    internal partial class VirtualMachineScaleSetVMsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetVMsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetVMsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs
index c32aaa7e5d42c..4c62023085b30 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineScaleSets service client. </summary>
-    public partial class VirtualMachineScaleSetsClient
+    public partial class VirtualMachineScaleSetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetsClient for mocking. </summary>
-        protected VirtualMachineScaleSetsClient()
+        internal VirtualMachineScaleSetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualMachineScaleSetsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSet>> GetAsync(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualMachineScaleSet>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSet> Get(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualMachineScaleSet> Get(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<VirtualMachineScaleSetInstanceView>> GetInsta
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<VirtualMachineScaleSetInstanceView> GetInstanceView(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RecoveryWalkResponse>> ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<RecoveryWalkResponse>> ForceRecoveryServiceFa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RecoveryWalkResponse> ForceRecoveryServiceFabricPlatformUpdateDomainWalk(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
             scope.Start();
             try
             {
@@ -160,7 +160,7 @@ public virtual Response<RecoveryWalkResponse> ForceRecoveryServiceFabricPlatform
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> ConvertToSinglePlacementGroupAsync(string resourceGroupName, string vmScaleSetName, VMScaleSetConvertToSinglePlacementGroupInput parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ConvertToSinglePlacementGroup");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ConvertToSinglePlacementGroup");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response> ConvertToSinglePlacementGroupAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response ConvertToSinglePlacementGroup(string resourceGroupName, string vmScaleSetName, VMScaleSetConvertToSinglePlacementGroupInput parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ConvertToSinglePlacementGroup");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ConvertToSinglePlacementGroup");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual AsyncPageable<VirtualMachineScaleSet> ListAsync(string resourceGr
 
             async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -220,7 +220,7 @@ async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual Pageable<VirtualMachineScaleSet> List(string resourceGroupName, C
 
             Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -285,7 +285,7 @@ public virtual AsyncPageable<VirtualMachineScaleSet> ListAllAsync(CancellationTo
         {
             async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -300,7 +300,7 @@ async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -322,7 +322,7 @@ public virtual Pageable<VirtualMachineScaleSet> ListAll(CancellationToken cancel
         {
             Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -337,7 +337,7 @@ Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -370,7 +370,7 @@ public virtual AsyncPageable<VirtualMachineScaleSetSku> ListSkusAsync(string res
 
             async Task<Page<VirtualMachineScaleSetSku>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -385,7 +385,7 @@ async Task<Page<VirtualMachineScaleSetSku>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSetSku>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -418,7 +418,7 @@ public virtual Pageable<VirtualMachineScaleSetSku> ListSkus(string resourceGroup
 
             Page<VirtualMachineScaleSetSku> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -433,7 +433,7 @@ Page<VirtualMachineScaleSetSku> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSetSku> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -466,7 +466,7 @@ public virtual AsyncPageable<UpgradeOperationHistoricalStatusInfo> GetOSUpgradeH
 
             async Task<Page<UpgradeOperationHistoricalStatusInfo>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -481,7 +481,7 @@ async Task<Page<UpgradeOperationHistoricalStatusInfo>> FirstPageFunc(int? pageSi
             }
             async Task<Page<UpgradeOperationHistoricalStatusInfo>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -514,7 +514,7 @@ public virtual Pageable<UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistor
 
             Page<UpgradeOperationHistoricalStatusInfo> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -529,7 +529,7 @@ Page<UpgradeOperationHistoricalStatusInfo> FirstPageFunc(int? pageSizeHint)
             }
             Page<UpgradeOperationHistoricalStatusInfo> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -565,7 +565,7 @@ public virtual async Task<VirtualMachineScaleSetsCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -599,7 +599,7 @@ public virtual VirtualMachineScaleSetsCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -633,7 +633,7 @@ public virtual async Task<VirtualMachineScaleSetsUpdateOperation> StartUpdateAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual VirtualMachineScaleSetsUpdateOperation StartUpdate(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -696,7 +696,7 @@ public virtual async Task<VirtualMachineScaleSetsDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -725,7 +725,7 @@ public virtual VirtualMachineScaleSetsDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -755,7 +755,7 @@ public virtual async Task<VirtualMachineScaleSetsDeallocateOperation> StartDeall
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -785,7 +785,7 @@ public virtual VirtualMachineScaleSetsDeallocateOperation StartDeallocate(string
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -819,7 +819,7 @@ public virtual async Task<VirtualMachineScaleSetsDeleteInstancesOperation> Start
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeleteInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeleteInstances");
             scope.Start();
             try
             {
@@ -853,7 +853,7 @@ public virtual VirtualMachineScaleSetsDeleteInstancesOperation StartDeleteInstan
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeleteInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeleteInstances");
             scope.Start();
             try
             {
@@ -884,7 +884,7 @@ public virtual async Task<VirtualMachineScaleSetsPowerOffOperation> StartPowerOf
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -915,7 +915,7 @@ public virtual VirtualMachineScaleSetsPowerOffOperation StartPowerOff(string res
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -945,7 +945,7 @@ public virtual async Task<VirtualMachineScaleSetsRestartOperation> StartRestartA
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -975,7 +975,7 @@ public virtual VirtualMachineScaleSetsRestartOperation StartRestart(string resou
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -1005,7 +1005,7 @@ public virtual async Task<VirtualMachineScaleSetsStartOperation> StartStartAsync
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartStart");
             scope.Start();
             try
             {
@@ -1035,7 +1035,7 @@ public virtual VirtualMachineScaleSetsStartOperation StartStart(string resourceG
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartStart");
             scope.Start();
             try
             {
@@ -1065,7 +1065,7 @@ public virtual async Task<VirtualMachineScaleSetsRedeployOperation> StartRedeplo
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1095,7 +1095,7 @@ public virtual VirtualMachineScaleSetsRedeployOperation StartRedeploy(string res
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1125,7 +1125,7 @@ public virtual async Task<VirtualMachineScaleSetsPerformMaintenanceOperation> St
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1155,7 +1155,7 @@ public virtual VirtualMachineScaleSetsPerformMaintenanceOperation StartPerformMa
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1189,7 +1189,7 @@ public virtual async Task<VirtualMachineScaleSetsUpdateInstancesOperation> Start
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdateInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdateInstances");
             scope.Start();
             try
             {
@@ -1223,7 +1223,7 @@ public virtual VirtualMachineScaleSetsUpdateInstancesOperation StartUpdateInstan
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdateInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdateInstances");
             scope.Start();
             try
             {
@@ -1253,7 +1253,7 @@ public virtual async Task<VirtualMachineScaleSetsReimageOperation> StartReimageA
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1283,7 +1283,7 @@ public virtual VirtualMachineScaleSetsReimageOperation StartReimage(string resou
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1313,7 +1313,7 @@ public virtual async Task<VirtualMachineScaleSetsReimageAllOperation> StartReima
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -1343,7 +1343,7 @@ public virtual VirtualMachineScaleSetsReimageAllOperation StartReimageAll(string
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -1377,7 +1377,7 @@ public virtual async Task<VirtualMachineScaleSetsSetOrchestrationServiceStateOpe
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartSetOrchestrationServiceState");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartSetOrchestrationServiceState");
             scope.Start();
             try
             {
@@ -1411,7 +1411,7 @@ public virtual VirtualMachineScaleSetsSetOrchestrationServiceStateOperation Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartSetOrchestrationServiceState");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartSetOrchestrationServiceState");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsRestOperations.cs
index 05f688d587ed8..386b9e00be745 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineScaleSetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineScaleSetsRestClient
+    internal partial class VirtualMachineScaleSetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesOperations.cs
similarity index 86%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesOperations.cs
index afe9500aa1365..6a84043c11dc5 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachineSizes service client. </summary>
-    public partial class VirtualMachineSizesClient
+    public partial class VirtualMachineSizesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineSizesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineSizesClient for mocking. </summary>
-        protected VirtualMachineSizesClient()
+        internal VirtualMachineSizesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineSizesOperations for mocking. </summary>
+        protected VirtualMachineSizesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineSizesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineSizesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineSizesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineSizesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineSizesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineSizesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<VirtualMachineSize> ListAsync(string location, Canc
 
             async Task<Page<VirtualMachineSize>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesOperations.List");
                 scope.Start();
                 try
                 {
@@ -77,7 +77,7 @@ public virtual Pageable<VirtualMachineSize> List(string location, CancellationTo
 
             Page<VirtualMachineSize> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesRestOperations.cs
similarity index 95%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesRestOperations.cs
index 96495e298143f..453bb37588810 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachineSizesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachineSizesRestClient
+    internal partial class VirtualMachineSizesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineSizesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineSizesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineSizesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineSizesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesOperations.cs
similarity index 96%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesOperations.cs
index dbd0158459fc1..59925844568ff 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Compute
 {
     /// <summary> The VirtualMachines service client. </summary>
-    public partial class VirtualMachinesClient
+    public partial class VirtualMachinesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachinesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachinesClient for mocking. </summary>
-        protected VirtualMachinesClient()
+        internal VirtualMachinesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachinesOperations for mocking. </summary>
+        protected VirtualMachinesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachinesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachinesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachinesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachinesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachinesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachinesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualMachinesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachine>> GetAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualMachine>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachine> Get(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualMachine> Get(string resourceGroupName, string vmN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineInstanceView>> InstanceViewAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.InstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.InstanceView");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<VirtualMachineInstanceView>> InstanceViewAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineInstanceView> InstanceView(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.InstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.InstanceView");
             scope.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response<VirtualMachineInstanceView> InstanceView(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> GeneralizeAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Generalize");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Generalize");
             scope.Start();
             try
             {
@@ -138,7 +138,7 @@ public virtual async Task<Response> GeneralizeAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Generalize(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Generalize");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Generalize");
             scope.Start();
             try
             {
@@ -157,7 +157,7 @@ public virtual Response Generalize(string resourceGroupName, string vmName, Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response SimulateEviction(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<VirtualMachine> ListByLocationAsync(string location
 
             async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachine>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualMachine> ListByLocation(string location, Cancella
 
             Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachine> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -287,7 +287,7 @@ public virtual AsyncPageable<VirtualMachine> ListAsync(string resourceGroupName,
 
             async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -302,7 +302,7 @@ async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachine>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -330,7 +330,7 @@ public virtual Pageable<VirtualMachine> List(string resourceGroupName, Cancellat
 
             Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -345,7 +345,7 @@ Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachine> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -368,7 +368,7 @@ public virtual AsyncPageable<VirtualMachine> ListAllAsync(string statusOnly = nu
         {
             async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -383,7 +383,7 @@ async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachine>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -406,7 +406,7 @@ public virtual Pageable<VirtualMachine> ListAll(string statusOnly = null, Cancel
         {
             Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -421,7 +421,7 @@ Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachine> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -454,7 +454,7 @@ public virtual AsyncPageable<VirtualMachineSize> ListAvailableSizesAsync(string
 
             async Task<Page<VirtualMachineSize>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
@@ -487,7 +487,7 @@ public virtual Pageable<VirtualMachineSize> ListAvailableSizes(string resourceGr
 
             Page<VirtualMachineSize> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
@@ -523,7 +523,7 @@ public virtual async Task<VirtualMachinesCaptureOperation> StartCaptureAsync(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCapture");
             scope.Start();
             try
             {
@@ -557,7 +557,7 @@ public virtual VirtualMachinesCaptureOperation StartCapture(string resourceGroup
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCapture");
             scope.Start();
             try
             {
@@ -591,7 +591,7 @@ public virtual async Task<VirtualMachinesCreateOrUpdateOperation> StartCreateOrU
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -625,7 +625,7 @@ public virtual VirtualMachinesCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -659,7 +659,7 @@ public virtual async Task<VirtualMachinesUpdateOperation> StartUpdateAsync(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -693,7 +693,7 @@ public virtual VirtualMachinesUpdateOperation StartUpdate(string resourceGroupNa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -722,7 +722,7 @@ public virtual async Task<VirtualMachinesDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -751,7 +751,7 @@ public virtual VirtualMachinesDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -780,7 +780,7 @@ public virtual async Task<VirtualMachinesConvertToManagedDisksOperation> StartCo
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartConvertToManagedDisks");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartConvertToManagedDisks");
             scope.Start();
             try
             {
@@ -809,7 +809,7 @@ public virtual VirtualMachinesConvertToManagedDisksOperation StartConvertToManag
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartConvertToManagedDisks");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartConvertToManagedDisks");
             scope.Start();
             try
             {
@@ -838,7 +838,7 @@ public virtual async Task<VirtualMachinesDeallocateOperation> StartDeallocateAsy
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -867,7 +867,7 @@ public virtual VirtualMachinesDeallocateOperation StartDeallocate(string resourc
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -897,7 +897,7 @@ public virtual async Task<VirtualMachinesPowerOffOperation> StartPowerOffAsync(s
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -927,7 +927,7 @@ public virtual VirtualMachinesPowerOffOperation StartPowerOff(string resourceGro
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -956,7 +956,7 @@ public virtual async Task<VirtualMachinesReapplyOperation> StartReapplyAsync(str
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReapply");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReapply");
             scope.Start();
             try
             {
@@ -985,7 +985,7 @@ public virtual VirtualMachinesReapplyOperation StartReapply(string resourceGroup
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReapply");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReapply");
             scope.Start();
             try
             {
@@ -1014,7 +1014,7 @@ public virtual async Task<VirtualMachinesRestartOperation> StartRestartAsync(str
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRestart");
             scope.Start();
             try
             {
@@ -1043,7 +1043,7 @@ public virtual VirtualMachinesRestartOperation StartRestart(string resourceGroup
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRestart");
             scope.Start();
             try
             {
@@ -1072,7 +1072,7 @@ public virtual async Task<VirtualMachinesStartOperation> StartStartAsync(string
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartStart");
             scope.Start();
             try
             {
@@ -1101,7 +1101,7 @@ public virtual VirtualMachinesStartOperation StartStart(string resourceGroupName
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartStart");
             scope.Start();
             try
             {
@@ -1130,7 +1130,7 @@ public virtual async Task<VirtualMachinesRedeployOperation> StartRedeployAsync(s
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1159,7 +1159,7 @@ public virtual VirtualMachinesRedeployOperation StartRedeploy(string resourceGro
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1189,7 +1189,7 @@ public virtual async Task<VirtualMachinesReimageOperation> StartReimageAsync(str
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1219,7 +1219,7 @@ public virtual VirtualMachinesReimageOperation StartReimage(string resourceGroup
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1248,7 +1248,7 @@ public virtual async Task<VirtualMachinesPerformMaintenanceOperation> StartPerfo
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1277,7 +1277,7 @@ public virtual VirtualMachinesPerformMaintenanceOperation StartPerformMaintenanc
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1311,7 +1311,7 @@ public virtual async Task<VirtualMachinesRunCommandOperation> StartRunCommandAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRunCommand");
             scope.Start();
             try
             {
@@ -1345,7 +1345,7 @@ public virtual VirtualMachinesRunCommandOperation StartRunCommand(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRunCommand");
             scope.Start();
             try
             {
diff --git a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesRestClient.cs b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesRestOperations.cs
similarity index 99%
rename from sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesRestClient.cs
rename to sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesRestOperations.cs
index 6a66c5807d451..1107e5751212f 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesRestClient.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/src/Generated/VirtualMachinesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Compute
 {
-    internal partial class VirtualMachinesRestClient
+    internal partial class VirtualMachinesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachinesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachinesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachinesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachinesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersOperations.cs
similarity index 94%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersOperations.cs
index 71115978074c4..6cda97d7dc559 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The Clusters service client. </summary>
-    public partial class ClustersClient
+    public partial class ClustersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ClustersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ClustersClient for mocking. </summary>
-        protected ClustersClient()
+        internal ClustersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ClustersOperations for mocking. </summary>
+        protected ClustersOperations()
         {
         }
-        /// <summary> Initializes a new instance of ClustersClient. </summary>
+        /// <summary> Initializes a new instance of ClustersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ClustersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ClustersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ClustersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ClustersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -41,7 +41,7 @@ internal ClustersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailableClustersList>> ListAvailableClustersAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListAvailableClusters");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListAvailableClusters");
             scope.Start();
             try
             {
@@ -58,7 +58,7 @@ public virtual async Task<Response<AvailableClustersList>> ListAvailableClusters
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailableClustersList> ListAvailableClusters(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListAvailableClusters");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListAvailableClusters");
             scope.Start();
             try
             {
@@ -77,7 +77,7 @@ public virtual Response<AvailableClustersList> ListAvailableClusters(Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Cluster>> GetAsync(string resourceGroupName, string clusterName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual async Task<Response<Cluster>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Cluster> Get(string resourceGroupName, string clusterName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.Get");
             scope.Start();
             try
             {
@@ -115,7 +115,7 @@ public virtual Response<Cluster> Get(string resourceGroupName, string clusterNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EHNamespaceIdListResult>> ListNamespacesAsync(string resourceGroupName, string clusterName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListNamespaces");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListNamespaces");
             scope.Start();
             try
             {
@@ -134,7 +134,7 @@ public virtual async Task<Response<EHNamespaceIdListResult>> ListNamespacesAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EHNamespaceIdListResult> ListNamespaces(string resourceGroupName, string clusterName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListNamespaces");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListNamespaces");
             scope.Start();
             try
             {
@@ -159,7 +159,7 @@ public virtual AsyncPageable<Cluster> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<Cluster>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -174,7 +174,7 @@ async Task<Page<Cluster>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Cluster>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -202,7 +202,7 @@ public virtual Pageable<Cluster> ListByResourceGroup(string resourceGroupName, C
 
             Page<Cluster> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -217,7 +217,7 @@ Page<Cluster> FirstPageFunc(int? pageSizeHint)
             }
             Page<Cluster> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ClustersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ClustersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual async Task<ClustersPutOperation> StartPutAsync(string resourceGro
                 throw new ArgumentNullException(nameof(clusterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.StartPut");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.StartPut");
             scope.Start();
             try
             {
@@ -277,7 +277,7 @@ public virtual ClustersPutOperation StartPut(string resourceGroupName, string cl
                 throw new ArgumentNullException(nameof(clusterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.StartPut");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.StartPut");
             scope.Start();
             try
             {
@@ -311,7 +311,7 @@ public virtual async Task<ClustersPatchOperation> StartPatchAsync(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.StartPatch");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.StartPatch");
             scope.Start();
             try
             {
@@ -345,7 +345,7 @@ public virtual ClustersPatchOperation StartPatch(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.StartPatch");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.StartPatch");
             scope.Start();
             try
             {
@@ -374,7 +374,7 @@ public virtual async Task<ClustersDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(clusterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -403,7 +403,7 @@ public virtual ClustersDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(clusterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ClustersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ClustersOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersRestOperations.cs
similarity index 99%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersRestOperations.cs
index 599b586179048..c695daf887e57 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ClustersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class ClustersRestClient
+    internal partial class ClustersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ClustersRestClient. </summary>
+        /// <summary> Initializes a new instance of ClustersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ClustersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ClustersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationOperations.cs
similarity index 90%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationOperations.cs
index 1d189ac4d0cde..3d2ad6807d9b9 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The Configuration service client. </summary>
-    public partial class ConfigurationClient
+    public partial class ConfigurationOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ConfigurationRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ConfigurationClient for mocking. </summary>
-        protected ConfigurationClient()
+        internal ConfigurationRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ConfigurationOperations for mocking. </summary>
+        protected ConfigurationOperations()
         {
         }
-        /// <summary> Initializes a new instance of ConfigurationClient. </summary>
+        /// <summary> Initializes a new instance of ConfigurationOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ConfigurationClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ConfigurationOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ConfigurationRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ConfigurationRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ConfigurationClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ClusterQuotaConfigurationProperties>> PatchAsync(string resourceGroupName, string clusterName, ClusterQuotaConfigurationProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationOperations.Patch");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ClusterQuotaConfigurationProperties>> PatchAs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ClusterQuotaConfigurationProperties> Patch(string resourceGroupName, string clusterName, ClusterQuotaConfigurationProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationOperations.Patch");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ClusterQuotaConfigurationProperties> Patch(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ClusterQuotaConfigurationProperties>> GetAsync(string resourceGroupName, string clusterName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<ClusterQuotaConfigurationProperties>> GetAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ClusterQuotaConfigurationProperties> Get(string resourceGroupName, string clusterName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConfigurationClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConfigurationOperations.Get");
             scope.Start();
             try
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationRestOperations.cs
similarity index 98%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationRestOperations.cs
index 5c8acff3ec1e7..ebaa1e70cbf41 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConfigurationRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class ConfigurationRestClient
+    internal partial class ConfigurationRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ConfigurationRestClient. </summary>
+        /// <summary> Initializes a new instance of ConfigurationRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ConfigurationRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ConfigurationRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsOperations.cs
similarity index 94%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsOperations.cs
index efd704fb635bf..26ef09b81ff0c 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The ConsumerGroups service client. </summary>
-    public partial class ConsumerGroupsClient
+    public partial class ConsumerGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ConsumerGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ConsumerGroupsClient for mocking. </summary>
-        protected ConsumerGroupsClient()
+        internal ConsumerGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ConsumerGroupsOperations for mocking. </summary>
+        protected ConsumerGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ConsumerGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ConsumerGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ConsumerGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ConsumerGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ConsumerGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ConsumerGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal ConsumerGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConsumerGroup>> CreateOrUpdateAsync(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, ConsumerGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -68,7 +68,7 @@ public virtual async Task<Response<ConsumerGroup>> CreateOrUpdateAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConsumerGroup> CreateOrUpdate(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, ConsumerGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual Response<ConsumerGroup> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -110,7 +110,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -131,7 +131,7 @@ public virtual Response Delete(string resourceGroupName, string namespaceName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConsumerGroup>> GetAsync(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual async Task<Response<ConsumerGroup>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConsumerGroup> Get(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual AsyncPageable<ConsumerGroup> ListByEventHubAsync(string resourceG
 
             async Task<Page<ConsumerGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.ListByEventHub");
+                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.ListByEventHub");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ async Task<Page<ConsumerGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ConsumerGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.ListByEventHub");
+                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.ListByEventHub");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ConsumerGroup> ListByEventHub(string resourceGroupName,
 
             Page<ConsumerGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.ListByEventHub");
+                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.ListByEventHub");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ConsumerGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ConsumerGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsClient.ListByEventHub");
+                using var scope = _clientDiagnostics.CreateScope("ConsumerGroupsOperations.ListByEventHub");
                 scope.Start();
                 try
                 {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsRestOperations.cs
similarity index 99%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsRestOperations.cs
index 2e15b817fccc5..939b5d86f816a 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/ConsumerGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class ConsumerGroupsRestClient
+    internal partial class ConsumerGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ConsumerGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ConsumerGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ConsumerGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ConsumerGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsOperations.cs
similarity index 94%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsOperations.cs
index cb7f2d30673fc..c6098dc3e2983 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The DisasterRecoveryConfigs service client. </summary>
-    public partial class DisasterRecoveryConfigsClient
+    public partial class DisasterRecoveryConfigsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DisasterRecoveryConfigsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DisasterRecoveryConfigsClient for mocking. </summary>
-        protected DisasterRecoveryConfigsClient()
+        internal DisasterRecoveryConfigsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DisasterRecoveryConfigsOperations for mocking. </summary>
+        protected DisasterRecoveryConfigsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DisasterRecoveryConfigsClient. </summary>
+        /// <summary> Initializes a new instance of DisasterRecoveryConfigsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DisasterRecoveryConfigsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DisasterRecoveryConfigsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DisasterRecoveryConfigsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DisasterRecoveryConfigsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal DisasterRecoveryConfigsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AuthorizationRule>> GetAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string @alias, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.GetAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.GetAuthorizationRule");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<AuthorizationRule>> GetAuthorizationRuleAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AuthorizationRule> GetAuthorizationRule(string resourceGroupName, string namespaceName, string @alias, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.GetAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.GetAuthorizationRule");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual Response<AuthorizationRule> GetAuthorizationRule(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AccessKeys>> ListKeysAsync(string resourceGroupName, string namespaceName, string @alias, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -108,7 +108,7 @@ public virtual async Task<Response<AccessKeys>> ListKeysAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AccessKeys> ListKeys(string resourceGroupName, string namespaceName, string @alias, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -128,7 +128,7 @@ public virtual Response<AccessKeys> ListKeys(string resourceGroupName, string na
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(string resourceGroupName, string namespaceName, CheckNameAvailabilityParameter parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -148,7 +148,7 @@ public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(string resourceGroupName, string namespaceName, CheckNameAvailabilityParameter parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ArmDisasterRecovery>> CreateOrUpdateAsync(string resourceGroupName, string namespaceName, string @alias, ArmDisasterRecovery parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual async Task<Response<ArmDisasterRecovery>> CreateOrUpdateAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ArmDisasterRecovery> CreateOrUpdate(string resourceGroupName, string namespaceName, string @alias, ArmDisasterRecovery parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response<ArmDisasterRecovery> CreateOrUpdate(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.Delete");
             scope.Start();
             try
             {
@@ -230,7 +230,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.Delete");
             scope.Start();
             try
             {
@@ -250,7 +250,7 @@ public virtual Response Delete(string resourceGroupName, string namespaceName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ArmDisasterRecovery>> GetAsync(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.Get");
             scope.Start();
             try
             {
@@ -270,7 +270,7 @@ public virtual async Task<Response<ArmDisasterRecovery>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ArmDisasterRecovery> Get(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.Get");
             scope.Start();
             try
             {
@@ -290,7 +290,7 @@ public virtual Response<ArmDisasterRecovery> Get(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> BreakPairingAsync(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.BreakPairing");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.BreakPairing");
             scope.Start();
             try
             {
@@ -310,7 +310,7 @@ public virtual async Task<Response> BreakPairingAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response BreakPairing(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.BreakPairing");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.BreakPairing");
             scope.Start();
             try
             {
@@ -330,7 +330,7 @@ public virtual Response BreakPairing(string resourceGroupName, string namespaceN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> FailOverAsync(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.FailOver");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.FailOver");
             scope.Start();
             try
             {
@@ -350,7 +350,7 @@ public virtual async Task<Response> FailOverAsync(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response FailOver(string resourceGroupName, string namespaceName, string @alias, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.FailOver");
+            using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.FailOver");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual AsyncPageable<AuthorizationRule> ListAuthorizationRulesAsync(stri
 
             async Task<Page<AuthorizationRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -400,7 +400,7 @@ async Task<Page<AuthorizationRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AuthorizationRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -438,7 +438,7 @@ public virtual Pageable<AuthorizationRule> ListAuthorizationRules(string resourc
 
             Page<AuthorizationRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -453,7 +453,7 @@ Page<AuthorizationRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<AuthorizationRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -486,7 +486,7 @@ public virtual AsyncPageable<ArmDisasterRecovery> ListAsync(string resourceGroup
 
             async Task<Page<ArmDisasterRecovery>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.List");
                 scope.Start();
                 try
                 {
@@ -501,7 +501,7 @@ async Task<Page<ArmDisasterRecovery>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ArmDisasterRecovery>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.List");
                 scope.Start();
                 try
                 {
@@ -534,7 +534,7 @@ public virtual Pageable<ArmDisasterRecovery> List(string resourceGroupName, stri
 
             Page<ArmDisasterRecovery> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.List");
                 scope.Start();
                 try
                 {
@@ -549,7 +549,7 @@ Page<ArmDisasterRecovery> FirstPageFunc(int? pageSizeHint)
             }
             Page<ArmDisasterRecovery> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisasterRecoveryConfigsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsRestOperations.cs
similarity index 99%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsRestOperations.cs
index d8b308045593a..abb034f248dc9 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/DisasterRecoveryConfigsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class DisasterRecoveryConfigsRestClient
+    internal partial class DisasterRecoveryConfigsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DisasterRecoveryConfigsRestClient. </summary>
+        /// <summary> Initializes a new instance of DisasterRecoveryConfigsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DisasterRecoveryConfigsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DisasterRecoveryConfigsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsManagementClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsManagementClient.cs
index 47e64753e2a99..7915b94ffb0b7 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsManagementClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsManagementClient.cs
@@ -53,52 +53,28 @@ public EventHubsManagementClient(string subscriptionId, Uri endpoint, TokenCrede
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of ClustersClient. </summary>
-        public virtual ClustersClient GetClustersClient()
-        {
-            return new ClustersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ClustersOperations. </summary>
+        public virtual ClustersOperations Clusters => new ClustersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NamespacesClient. </summary>
-        public virtual NamespacesClient GetNamespacesClient()
-        {
-            return new NamespacesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NamespacesOperations. </summary>
+        public virtual NamespacesOperations Namespaces => new NamespacesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ConfigurationClient. </summary>
-        public virtual ConfigurationClient GetConfigurationClient()
-        {
-            return new ConfigurationClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ConfigurationOperations. </summary>
+        public virtual ConfigurationOperations Configuration => new ConfigurationOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DisasterRecoveryConfigsClient. </summary>
-        public virtual DisasterRecoveryConfigsClient GetDisasterRecoveryConfigsClient()
-        {
-            return new DisasterRecoveryConfigsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DisasterRecoveryConfigsOperations. </summary>
+        public virtual DisasterRecoveryConfigsOperations DisasterRecoveryConfigs => new DisasterRecoveryConfigsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of EventHubsClient. </summary>
-        public virtual EventHubsClient GetEventHubsClient()
-        {
-            return new EventHubsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of EventHubsOperations. </summary>
+        public virtual EventHubsOperations EventHubs => new EventHubsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ConsumerGroupsClient. </summary>
-        public virtual ConsumerGroupsClient GetConsumerGroupsClient()
-        {
-            return new ConsumerGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ConsumerGroupsOperations. </summary>
+        public virtual ConsumerGroupsOperations ConsumerGroups => new ConsumerGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of RegionsClient. </summary>
-        public virtual RegionsClient GetRegionsClient()
-        {
-            return new RegionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RegionsOperations. </summary>
+        public virtual RegionsOperations Regions => new RegionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsOperations.cs
similarity index 95%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsOperations.cs
index e314d5355931f..126619fe064c0 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The EventHubs service client. </summary>
-    public partial class EventHubsClient
+    public partial class EventHubsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal EventHubsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of EventHubsClient for mocking. </summary>
-        protected EventHubsClient()
+        internal EventHubsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of EventHubsOperations for mocking. </summary>
+        protected EventHubsOperations()
         {
         }
-        /// <summary> Initializes a new instance of EventHubsClient. </summary>
+        /// <summary> Initializes a new instance of EventHubsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal EventHubsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal EventHubsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new EventHubsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new EventHubsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal EventHubsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AuthorizationRule>> CreateOrUpdateAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, AuthorizationRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.CreateOrUpdateAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.CreateOrUpdateAuthorizationRule");
             scope.Start();
             try
             {
@@ -68,7 +68,7 @@ public virtual async Task<Response<AuthorizationRule>> CreateOrUpdateAuthorizati
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AuthorizationRule> CreateOrUpdateAuthorizationRule(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, AuthorizationRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.CreateOrUpdateAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.CreateOrUpdateAuthorizationRule");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual Response<AuthorizationRule> CreateOrUpdateAuthorizationRule(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AuthorizationRule>> GetAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.GetAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.GetAuthorizationRule");
             scope.Start();
             try
             {
@@ -110,7 +110,7 @@ public virtual async Task<Response<AuthorizationRule>> GetAuthorizationRuleAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AuthorizationRule> GetAuthorizationRule(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.GetAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.GetAuthorizationRule");
             scope.Start();
             try
             {
@@ -131,7 +131,7 @@ public virtual Response<AuthorizationRule> GetAuthorizationRule(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.DeleteAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.DeleteAuthorizationRule");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual async Task<Response> DeleteAuthorizationRuleAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAuthorizationRule(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.DeleteAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.DeleteAuthorizationRule");
             scope.Start();
             try
             {
@@ -173,7 +173,7 @@ public virtual Response DeleteAuthorizationRule(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AccessKeys>> ListKeysAsync(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -194,7 +194,7 @@ public virtual async Task<Response<AccessKeys>> ListKeysAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AccessKeys> ListKeys(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -216,7 +216,7 @@ public virtual Response<AccessKeys> ListKeys(string resourceGroupName, string na
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AccessKeys>> RegenerateKeysAsync(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, RegenerateAccessKeyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.RegenerateKeys");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.RegenerateKeys");
             scope.Start();
             try
             {
@@ -238,7 +238,7 @@ public virtual async Task<Response<AccessKeys>> RegenerateKeysAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AccessKeys> RegenerateKeys(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, RegenerateAccessKeyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.RegenerateKeys");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.RegenerateKeys");
             scope.Start();
             try
             {
@@ -259,7 +259,7 @@ public virtual Response<AccessKeys> RegenerateKeys(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Eventhub>> CreateOrUpdateAsync(string resourceGroupName, string namespaceName, string eventHubName, Eventhub parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -280,7 +280,7 @@ public virtual async Task<Response<Eventhub>> CreateOrUpdateAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Eventhub> CreateOrUpdate(string resourceGroupName, string namespaceName, string eventHubName, Eventhub parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -300,7 +300,7 @@ public virtual Response<Eventhub> CreateOrUpdate(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string namespaceName, string eventHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.Delete");
             scope.Start();
             try
             {
@@ -320,7 +320,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string namespaceName, string eventHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.Delete");
             scope.Start();
             try
             {
@@ -340,7 +340,7 @@ public virtual Response Delete(string resourceGroupName, string namespaceName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Eventhub>> GetAsync(string resourceGroupName, string namespaceName, string eventHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.Get");
             scope.Start();
             try
             {
@@ -360,7 +360,7 @@ public virtual async Task<Response<Eventhub>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Eventhub> Get(string resourceGroupName, string namespaceName, string eventHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EventHubsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.Get");
             scope.Start();
             try
             {
@@ -395,7 +395,7 @@ public virtual AsyncPageable<AuthorizationRule> ListAuthorizationRulesAsync(stri
 
             async Task<Page<AuthorizationRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -410,7 +410,7 @@ async Task<Page<AuthorizationRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AuthorizationRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -448,7 +448,7 @@ public virtual Pageable<AuthorizationRule> ListAuthorizationRules(string resourc
 
             Page<AuthorizationRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -463,7 +463,7 @@ Page<AuthorizationRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<AuthorizationRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -498,7 +498,7 @@ public virtual AsyncPageable<Eventhub> ListByNamespaceAsync(string resourceGroup
 
             async Task<Page<Eventhub>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListByNamespace");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListByNamespace");
                 scope.Start();
                 try
                 {
@@ -513,7 +513,7 @@ async Task<Page<Eventhub>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Eventhub>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListByNamespace");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListByNamespace");
                 scope.Start();
                 try
                 {
@@ -548,7 +548,7 @@ public virtual Pageable<Eventhub> ListByNamespace(string resourceGroupName, stri
 
             Page<Eventhub> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListByNamespace");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListByNamespace");
                 scope.Start();
                 try
                 {
@@ -563,7 +563,7 @@ Page<Eventhub> FirstPageFunc(int? pageSizeHint)
             }
             Page<Eventhub> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EventHubsClient.ListByNamespace");
+                using var scope = _clientDiagnostics.CreateScope("EventHubsOperations.ListByNamespace");
                 scope.Start();
                 try
                 {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsRestOperations.cs
similarity index 99%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsRestOperations.cs
index a44b47ecb508c..1dfd606fe0372 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/EventHubsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class EventHubsRestClient
+    internal partial class EventHubsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of EventHubsRestClient. </summary>
+        /// <summary> Initializes a new instance of EventHubsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public EventHubsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public EventHubsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesOperations.cs
similarity index 95%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesOperations.cs
index 3312a9bd6f81f..9d87b86fda024 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The Namespaces service client. </summary>
-    public partial class NamespacesClient
+    public partial class NamespacesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NamespacesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NamespacesClient for mocking. </summary>
-        protected NamespacesClient()
+        internal NamespacesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NamespacesOperations for mocking. </summary>
+        protected NamespacesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NamespacesClient. </summary>
+        /// <summary> Initializes a new instance of NamespacesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NamespacesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NamespacesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NamespacesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NamespacesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal NamespacesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpFilterRule>> CreateOrUpdateIpFilterRuleAsync(string resourceGroupName, string namespaceName, string ipFilterRuleName, IpFilterRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateIpFilterRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateIpFilterRule");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<IpFilterRule>> CreateOrUpdateIpFilterRuleAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpFilterRule> CreateOrUpdateIpFilterRule(string resourceGroupName, string namespaceName, string ipFilterRuleName, IpFilterRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateIpFilterRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateIpFilterRule");
             scope.Start();
             try
             {
@@ -86,7 +86,7 @@ public virtual Response<IpFilterRule> CreateOrUpdateIpFilterRule(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteIpFilterRuleAsync(string resourceGroupName, string namespaceName, string ipFilterRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.DeleteIpFilterRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.DeleteIpFilterRule");
             scope.Start();
             try
             {
@@ -106,7 +106,7 @@ public virtual async Task<Response> DeleteIpFilterRuleAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteIpFilterRule(string resourceGroupName, string namespaceName, string ipFilterRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.DeleteIpFilterRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.DeleteIpFilterRule");
             scope.Start();
             try
             {
@@ -126,7 +126,7 @@ public virtual Response DeleteIpFilterRule(string resourceGroupName, string name
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpFilterRule>> GetIpFilterRuleAsync(string resourceGroupName, string namespaceName, string ipFilterRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetIpFilterRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetIpFilterRule");
             scope.Start();
             try
             {
@@ -146,7 +146,7 @@ public virtual async Task<Response<IpFilterRule>> GetIpFilterRuleAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpFilterRule> GetIpFilterRule(string resourceGroupName, string namespaceName, string ipFilterRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetIpFilterRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetIpFilterRule");
             scope.Start();
             try
             {
@@ -165,7 +165,7 @@ public virtual Response<IpFilterRule> GetIpFilterRule(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EHNamespace>> GetAsync(string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.Get");
             scope.Start();
             try
             {
@@ -184,7 +184,7 @@ public virtual async Task<Response<EHNamespace>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EHNamespace> Get(string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.Get");
             scope.Start();
             try
             {
@@ -204,7 +204,7 @@ public virtual Response<EHNamespace> Get(string resourceGroupName, string namesp
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EHNamespace>> UpdateAsync(string resourceGroupName, string namespaceName, EHNamespace parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.Update");
             scope.Start();
             try
             {
@@ -224,7 +224,7 @@ public virtual async Task<Response<EHNamespace>> UpdateAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EHNamespace> Update(string resourceGroupName, string namespaceName, EHNamespace parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.Update");
             scope.Start();
             try
             {
@@ -245,7 +245,7 @@ public virtual Response<EHNamespace> Update(string resourceGroupName, string nam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkRule>> CreateOrUpdateVirtualNetworkRuleAsync(string resourceGroupName, string namespaceName, string virtualNetworkRuleName, VirtualNetworkRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateVirtualNetworkRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateVirtualNetworkRule");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<Response<VirtualNetworkRule>> CreateOrUpdateVirtualNet
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkRule> CreateOrUpdateVirtualNetworkRule(string resourceGroupName, string namespaceName, string virtualNetworkRuleName, VirtualNetworkRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateVirtualNetworkRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateVirtualNetworkRule");
             scope.Start();
             try
             {
@@ -286,7 +286,7 @@ public virtual Response<VirtualNetworkRule> CreateOrUpdateVirtualNetworkRule(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteVirtualNetworkRuleAsync(string resourceGroupName, string namespaceName, string virtualNetworkRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.DeleteVirtualNetworkRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.DeleteVirtualNetworkRule");
             scope.Start();
             try
             {
@@ -306,7 +306,7 @@ public virtual async Task<Response> DeleteVirtualNetworkRuleAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteVirtualNetworkRule(string resourceGroupName, string namespaceName, string virtualNetworkRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.DeleteVirtualNetworkRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.DeleteVirtualNetworkRule");
             scope.Start();
             try
             {
@@ -326,7 +326,7 @@ public virtual Response DeleteVirtualNetworkRule(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkRule>> GetVirtualNetworkRuleAsync(string resourceGroupName, string namespaceName, string virtualNetworkRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetVirtualNetworkRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetVirtualNetworkRule");
             scope.Start();
             try
             {
@@ -346,7 +346,7 @@ public virtual async Task<Response<VirtualNetworkRule>> GetVirtualNetworkRuleAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkRule> GetVirtualNetworkRule(string resourceGroupName, string namespaceName, string virtualNetworkRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetVirtualNetworkRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetVirtualNetworkRule");
             scope.Start();
             try
             {
@@ -366,7 +366,7 @@ public virtual Response<VirtualNetworkRule> GetVirtualNetworkRule(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkRuleSet>> CreateOrUpdateNetworkRuleSetAsync(string resourceGroupName, string namespaceName, NetworkRuleSet parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateNetworkRuleSet");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateNetworkRuleSet");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<Response<NetworkRuleSet>> CreateOrUpdateNetworkRuleSet
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkRuleSet> CreateOrUpdateNetworkRuleSet(string resourceGroupName, string namespaceName, NetworkRuleSet parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateNetworkRuleSet");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateNetworkRuleSet");
             scope.Start();
             try
             {
@@ -405,7 +405,7 @@ public virtual Response<NetworkRuleSet> CreateOrUpdateNetworkRuleSet(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkRuleSet>> GetNetworkRuleSetAsync(string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetNetworkRuleSet");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetNetworkRuleSet");
             scope.Start();
             try
             {
@@ -424,7 +424,7 @@ public virtual async Task<Response<NetworkRuleSet>> GetNetworkRuleSetAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkRuleSet> GetNetworkRuleSet(string resourceGroupName, string namespaceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetNetworkRuleSet");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetNetworkRuleSet");
             scope.Start();
             try
             {
@@ -445,7 +445,7 @@ public virtual Response<NetworkRuleSet> GetNetworkRuleSet(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AuthorizationRule>> CreateOrUpdateAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, AuthorizationRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateAuthorizationRule");
             scope.Start();
             try
             {
@@ -466,7 +466,7 @@ public virtual async Task<Response<AuthorizationRule>> CreateOrUpdateAuthorizati
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AuthorizationRule> CreateOrUpdateAuthorizationRule(string resourceGroupName, string namespaceName, string authorizationRuleName, AuthorizationRule parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CreateOrUpdateAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CreateOrUpdateAuthorizationRule");
             scope.Start();
             try
             {
@@ -486,7 +486,7 @@ public virtual Response<AuthorizationRule> CreateOrUpdateAuthorizationRule(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.DeleteAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.DeleteAuthorizationRule");
             scope.Start();
             try
             {
@@ -506,7 +506,7 @@ public virtual async Task<Response> DeleteAuthorizationRuleAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAuthorizationRule(string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.DeleteAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.DeleteAuthorizationRule");
             scope.Start();
             try
             {
@@ -526,7 +526,7 @@ public virtual Response DeleteAuthorizationRule(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AuthorizationRule>> GetAuthorizationRuleAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetAuthorizationRule");
             scope.Start();
             try
             {
@@ -546,7 +546,7 @@ public virtual async Task<Response<AuthorizationRule>> GetAuthorizationRuleAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AuthorizationRule> GetAuthorizationRule(string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.GetAuthorizationRule");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.GetAuthorizationRule");
             scope.Start();
             try
             {
@@ -566,7 +566,7 @@ public virtual Response<AuthorizationRule> GetAuthorizationRule(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AccessKeys>> ListKeysAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListKeys");
             scope.Start();
             try
             {
@@ -586,7 +586,7 @@ public virtual async Task<Response<AccessKeys>> ListKeysAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AccessKeys> ListKeys(string resourceGroupName, string namespaceName, string authorizationRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListKeys");
             scope.Start();
             try
             {
@@ -607,7 +607,7 @@ public virtual Response<AccessKeys> ListKeys(string resourceGroupName, string na
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AccessKeys>> RegenerateKeysAsync(string resourceGroupName, string namespaceName, string authorizationRuleName, RegenerateAccessKeyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.RegenerateKeys");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.RegenerateKeys");
             scope.Start();
             try
             {
@@ -628,7 +628,7 @@ public virtual async Task<Response<AccessKeys>> RegenerateKeysAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AccessKeys> RegenerateKeys(string resourceGroupName, string namespaceName, string authorizationRuleName, RegenerateAccessKeyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.RegenerateKeys");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.RegenerateKeys");
             scope.Start();
             try
             {
@@ -646,7 +646,7 @@ public virtual Response<AccessKeys> RegenerateKeys(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(CheckNameAvailabilityParameter parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -664,7 +664,7 @@ public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(CheckNameAvailabilityParameter parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -694,7 +694,7 @@ public virtual AsyncPageable<IpFilterRule> ListIPFilterRulesAsync(string resourc
 
             async Task<Page<IpFilterRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListIPFilterRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListIPFilterRules");
                 scope.Start();
                 try
                 {
@@ -709,7 +709,7 @@ async Task<Page<IpFilterRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpFilterRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListIPFilterRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListIPFilterRules");
                 scope.Start();
                 try
                 {
@@ -742,7 +742,7 @@ public virtual Pageable<IpFilterRule> ListIPFilterRules(string resourceGroupName
 
             Page<IpFilterRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListIPFilterRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListIPFilterRules");
                 scope.Start();
                 try
                 {
@@ -757,7 +757,7 @@ Page<IpFilterRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpFilterRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListIPFilterRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListIPFilterRules");
                 scope.Start();
                 try
                 {
@@ -779,7 +779,7 @@ public virtual AsyncPageable<EHNamespace> ListAsync(CancellationToken cancellati
         {
             async Task<Page<EHNamespace>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -794,7 +794,7 @@ async Task<Page<EHNamespace>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<EHNamespace>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -816,7 +816,7 @@ public virtual Pageable<EHNamespace> List(CancellationToken cancellationToken =
         {
             Page<EHNamespace> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -831,7 +831,7 @@ Page<EHNamespace> FirstPageFunc(int? pageSizeHint)
             }
             Page<EHNamespace> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -859,7 +859,7 @@ public virtual AsyncPageable<EHNamespace> ListByResourceGroupAsync(string resour
 
             async Task<Page<EHNamespace>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -874,7 +874,7 @@ async Task<Page<EHNamespace>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<EHNamespace>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -902,7 +902,7 @@ public virtual Pageable<EHNamespace> ListByResourceGroup(string resourceGroupNam
 
             Page<EHNamespace> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -917,7 +917,7 @@ Page<EHNamespace> FirstPageFunc(int? pageSizeHint)
             }
             Page<EHNamespace> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -950,7 +950,7 @@ public virtual AsyncPageable<VirtualNetworkRule> ListVirtualNetworkRulesAsync(st
 
             async Task<Page<VirtualNetworkRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListVirtualNetworkRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListVirtualNetworkRules");
                 scope.Start();
                 try
                 {
@@ -965,7 +965,7 @@ async Task<Page<VirtualNetworkRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListVirtualNetworkRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListVirtualNetworkRules");
                 scope.Start();
                 try
                 {
@@ -998,7 +998,7 @@ public virtual Pageable<VirtualNetworkRule> ListVirtualNetworkRules(string resou
 
             Page<VirtualNetworkRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListVirtualNetworkRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListVirtualNetworkRules");
                 scope.Start();
                 try
                 {
@@ -1013,7 +1013,7 @@ Page<VirtualNetworkRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListVirtualNetworkRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListVirtualNetworkRules");
                 scope.Start();
                 try
                 {
@@ -1046,7 +1046,7 @@ public virtual AsyncPageable<AuthorizationRule> ListAuthorizationRulesAsync(stri
 
             async Task<Page<AuthorizationRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -1061,7 +1061,7 @@ async Task<Page<AuthorizationRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AuthorizationRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -1094,7 +1094,7 @@ public virtual Pageable<AuthorizationRule> ListAuthorizationRules(string resourc
 
             Page<AuthorizationRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -1109,7 +1109,7 @@ Page<AuthorizationRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<AuthorizationRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NamespacesClient.ListAuthorizationRules");
+                using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.ListAuthorizationRules");
                 scope.Start();
                 try
                 {
@@ -1145,7 +1145,7 @@ public virtual async Task<NamespacesCreateOrUpdateOperation> StartCreateOrUpdate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -1179,7 +1179,7 @@ public virtual NamespacesCreateOrUpdateOperation StartCreateOrUpdate(string reso
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -1208,7 +1208,7 @@ public virtual async Task<NamespacesDeleteOperation> StartDeleteAsync(string res
                 throw new ArgumentNullException(nameof(namespaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -1237,7 +1237,7 @@ public virtual NamespacesDeleteOperation StartDelete(string resourceGroupName, s
                 throw new ArgumentNullException(nameof(namespaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NamespacesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NamespacesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesRestOperations.cs
similarity index 99%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesRestOperations.cs
index dedab7b16ccd1..62d62df9b5545 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/NamespacesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class NamespacesRestClient
+    internal partial class NamespacesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NamespacesRestClient. </summary>
+        /// <summary> Initializes a new instance of NamespacesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NamespacesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NamespacesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/OperationsClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/Operations.cs
similarity index 85%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/OperationsClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/Operations.cs
index f69785c2eb89a..0101e5e915f3f 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/OperationsClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/Operations.cs
@@ -15,23 +15,23 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Operation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<Operation> FirstPageFunc(int? pageSizeHint)
             }
             Page<Operation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsOperations.cs
similarity index 87%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsOperations.cs
index 5f0c5f34c7c90..675dab4c1d9a3 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.EventHubs
 {
     /// <summary> The Regions service client. </summary>
-    public partial class RegionsClient
+    public partial class RegionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RegionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RegionsClient for mocking. </summary>
-        protected RegionsClient()
+        internal RegionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RegionsOperations for mocking. </summary>
+        protected RegionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of RegionsClient. </summary>
+        /// <summary> Initializes a new instance of RegionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RegionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RegionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RegionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RegionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<MessagingRegions> ListBySkuAsync(string sku, Cancel
 
             async Task<Page<MessagingRegions>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RegionsClient.ListBySku");
+                using var scope = _clientDiagnostics.CreateScope("RegionsOperations.ListBySku");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<MessagingRegions>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<MessagingRegions>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RegionsClient.ListBySku");
+                using var scope = _clientDiagnostics.CreateScope("RegionsOperations.ListBySku");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<MessagingRegions> ListBySku(string sku, CancellationToke
 
             Page<MessagingRegions> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RegionsClient.ListBySku");
+                using var scope = _clientDiagnostics.CreateScope("RegionsOperations.ListBySku");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<MessagingRegions> FirstPageFunc(int? pageSizeHint)
             }
             Page<MessagingRegions> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RegionsClient.ListBySku");
+                using var scope = _clientDiagnostics.CreateScope("RegionsOperations.ListBySku");
                 scope.Start();
                 try
                 {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsRestOperations.cs
similarity index 97%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsRestOperations.cs
index 765dfa47443d7..d685a4d5c6ff5 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RegionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class RegionsRestClient
+    internal partial class RegionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RegionsRestClient. </summary>
+        /// <summary> Initializes a new instance of RegionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials that uniquely identify a Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RegionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RegionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/OperationsRestClient.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RestOperations.cs
similarity index 96%
rename from sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/OperationsRestClient.cs
rename to sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RestOperations.cs
index c1b22420bd9d5..6a28ee098be84 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/OperationsRestClient.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/src/Generated/RestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.EventHubs
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/KeyVaultManagementClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/KeyVaultManagementClient.cs
index 423b94fee2bff..d77c8edf38c44 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/KeyVaultManagementClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/KeyVaultManagementClient.cs
@@ -53,28 +53,16 @@ public KeyVaultManagementClient(string subscriptionId, Uri endpoint, TokenCreden
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of VaultsClient. </summary>
-        public virtual VaultsClient GetVaultsClient()
-        {
-            return new VaultsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VaultsOperations. </summary>
+        public virtual VaultsOperations Vaults => new VaultsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateEndpointConnectionsClient. </summary>
-        public virtual PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient()
-        {
-            return new PrivateEndpointConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateEndpointConnectionsOperations. </summary>
+        public virtual PrivateEndpointConnectionsOperations PrivateEndpointConnections => new PrivateEndpointConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateLinkResourcesClient. </summary>
-        public virtual PrivateLinkResourcesClient GetPrivateLinkResourcesClient()
-        {
-            return new PrivateLinkResourcesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateLinkResourcesOperations. </summary>
+        public virtual PrivateLinkResourcesOperations PrivateLinkResources => new PrivateLinkResourcesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
     }
 }
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/OperationsClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Operations.cs
similarity index 84%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/OperationsClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Operations.cs
index b84c23fbde426..68092dadf6177 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/OperationsClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/Operations.cs
@@ -15,24 +15,24 @@
 
 namespace Azure.ResourceManager.KeyVault
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-09-01")
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint, apiVersion);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Operation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<Operation> FirstPageFunc(int? pageSizeHint)
             }
             Page<Operation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs
similarity index 91%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs
index 168772cd590cf..52fc4696303da 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.KeyVault
 {
     /// <summary> The PrivateEndpointConnections service client. </summary>
-    public partial class PrivateEndpointConnectionsClient
+    public partial class PrivateEndpointConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateEndpointConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient for mocking. </summary>
-        protected PrivateEndpointConnectionsClient()
+        internal PrivateEndpointConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations for mocking. </summary>
+        protected PrivateEndpointConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
+        internal PrivateEndpointConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
-            RestClient = new PrivateEndpointConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateEndpointConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName, string vaultName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> PutAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, PrivateEndpointConnection properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Put");
             scope.Start();
             try
             {
@@ -106,7 +106,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> PutAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Put(string resourceGroupName, string vaultName, string privateEndpointConnectionName, PrivateEndpointConnection properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Put");
             scope.Start();
             try
             {
@@ -139,7 +139,7 @@ public virtual async Task<PrivateEndpointConnectionsDeleteOperation> StartDelete
                 throw new ArgumentNullException(nameof(privateEndpointConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -173,7 +173,7 @@ public virtual PrivateEndpointConnectionsDeleteOperation StartDelete(string reso
                 throw new ArgumentNullException(nameof(privateEndpointConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsRestClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsRestOperations.cs
similarity index 98%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsRestClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsRestOperations.cs
index 0fef31cdb2c8b..f065b4b423a66 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsRestClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateEndpointConnectionsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.KeyVault
 {
-    internal partial class PrivateEndpointConnectionsRestClient
+    internal partial class PrivateEndpointConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateEndpointConnectionsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateEndpointConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
+        public PrivateEndpointConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs
similarity index 82%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs
index b02407bf8b4ac..1ee1a3551b0f0 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.KeyVault
 {
     /// <summary> The PrivateLinkResources service client. </summary>
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateLinkResourcesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateLinkResourcesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient for mocking. </summary>
-        protected PrivateLinkResourcesClient()
+        internal PrivateLinkResourcesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations for mocking. </summary>
+        protected PrivateLinkResourcesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
+        internal PrivateLinkResourcesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
-            RestClient = new PrivateLinkResourcesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateLinkResourcesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkResourceListResult>> ListByVaultAsync(string resourceGroupName, string vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByVault");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByVault");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<PrivateLinkResourceListResult>> ListByVaultAs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkResourceListResult> ListByVault(string resourceGroupName, string vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByVault");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByVault");
             scope.Start();
             try
             {
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesRestClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesRestOperations.cs
similarity index 95%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesRestClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesRestOperations.cs
index acb773531538c..e551995d4cfbb 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesRestClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/PrivateLinkResourcesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.KeyVault
 {
-    internal partial class PrivateLinkResourcesRestClient
+    internal partial class PrivateLinkResourcesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateLinkResourcesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateLinkResourcesRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateLinkResourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
+        public PrivateLinkResourcesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/OperationsRestClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/RestOperations.cs
similarity index 96%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/OperationsRestClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/RestOperations.cs
index be5f4d43508da..5a8dd182446df 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/OperationsRestClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/RestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.KeyVault
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private string apiVersion;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-09-01")
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
             endpoint ??= new Uri("https://management.azure.com");
             if (apiVersion == null)
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsOperations.cs
similarity index 95%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsOperations.cs
index 0db963515478a..df3390b8e8724 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.KeyVault
 {
     /// <summary> The Vaults service client. </summary>
-    public partial class VaultsClient
+    public partial class VaultsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VaultsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VaultsClient for mocking. </summary>
-        protected VaultsClient()
+        internal VaultsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VaultsOperations for mocking. </summary>
+        protected VaultsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VaultsClient. </summary>
+        /// <summary> Initializes a new instance of VaultsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal VaultsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
+        internal VaultsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
-            RestClient = new VaultsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new VaultsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VaultsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Vault>> UpdateAsync(string resourceGroupName, string vaultName, VaultPatchParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.Update");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<Vault>> UpdateAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Vault> Update(string resourceGroupName, string vaultName, VaultPatchParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.Update");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<Vault> Update(string resourceGroupName, string vaultName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.Delete");
             scope.Start();
             try
             {
@@ -103,7 +103,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.Delete");
             scope.Start();
             try
             {
@@ -122,7 +122,7 @@ public virtual Response Delete(string resourceGroupName, string vaultName, Cance
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Vault>> GetAsync(string resourceGroupName, string vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.Get");
             scope.Start();
             try
             {
@@ -141,7 +141,7 @@ public virtual async Task<Response<Vault>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Vault> Get(string resourceGroupName, string vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.Get");
             scope.Start();
             try
             {
@@ -162,7 +162,7 @@ public virtual Response<Vault> Get(string resourceGroupName, string vaultName, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VaultAccessPolicyParameters>> UpdateAccessPolicyAsync(string resourceGroupName, string vaultName, AccessPolicyUpdateKind operationKind, VaultAccessPolicyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.UpdateAccessPolicy");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.UpdateAccessPolicy");
             scope.Start();
             try
             {
@@ -183,7 +183,7 @@ public virtual async Task<Response<VaultAccessPolicyParameters>> UpdateAccessPol
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VaultAccessPolicyParameters> UpdateAccessPolicy(string resourceGroupName, string vaultName, AccessPolicyUpdateKind operationKind, VaultAccessPolicyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.UpdateAccessPolicy");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.UpdateAccessPolicy");
             scope.Start();
             try
             {
@@ -202,7 +202,7 @@ public virtual Response<VaultAccessPolicyParameters> UpdateAccessPolicy(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeletedVault>> GetDeletedAsync(string vaultName, string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.GetDeleted");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.GetDeleted");
             scope.Start();
             try
             {
@@ -221,7 +221,7 @@ public virtual async Task<Response<DeletedVault>> GetDeletedAsync(string vaultNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeletedVault> GetDeleted(string vaultName, string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.GetDeleted");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.GetDeleted");
             scope.Start();
             try
             {
@@ -239,7 +239,7 @@ public virtual Response<DeletedVault> GetDeleted(string vaultName, string locati
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(VaultCheckNameAvailabilityParameters vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -257,7 +257,7 @@ public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(VaultCheckNameAvailabilityParameters vaultName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -283,7 +283,7 @@ public virtual AsyncPageable<Vault> ListByResourceGroupAsync(string resourceGrou
 
             async Task<Page<Vault>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -298,7 +298,7 @@ async Task<Page<Vault>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Vault>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -327,7 +327,7 @@ public virtual Pageable<Vault> ListByResourceGroup(string resourceGroupName, int
 
             Page<Vault> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -342,7 +342,7 @@ Page<Vault> FirstPageFunc(int? pageSizeHint)
             }
             Page<Vault> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -365,7 +365,7 @@ public virtual AsyncPageable<Vault> ListBySubscriptionAsync(int? top = null, Can
         {
             async Task<Page<Vault>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -380,7 +380,7 @@ async Task<Page<Vault>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Vault>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -403,7 +403,7 @@ public virtual Pageable<Vault> ListBySubscription(int? top = null, CancellationT
         {
             Page<Vault> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -418,7 +418,7 @@ Page<Vault> FirstPageFunc(int? pageSizeHint)
             }
             Page<Vault> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -440,7 +440,7 @@ public virtual AsyncPageable<DeletedVault> ListDeletedAsync(CancellationToken ca
         {
             async Task<Page<DeletedVault>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListDeleted");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListDeleted");
                 scope.Start();
                 try
                 {
@@ -455,7 +455,7 @@ async Task<Page<DeletedVault>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeletedVault>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListDeleted");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListDeleted");
                 scope.Start();
                 try
                 {
@@ -477,7 +477,7 @@ public virtual Pageable<DeletedVault> ListDeleted(CancellationToken cancellation
         {
             Page<DeletedVault> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListDeleted");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListDeleted");
                 scope.Start();
                 try
                 {
@@ -492,7 +492,7 @@ Page<DeletedVault> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeletedVault> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.ListDeleted");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.ListDeleted");
                 scope.Start();
                 try
                 {
@@ -515,7 +515,7 @@ public virtual AsyncPageable<Resource> ListAsync(int? top = null, CancellationTo
         {
             async Task<Page<Resource>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.List");
                 scope.Start();
                 try
                 {
@@ -530,7 +530,7 @@ async Task<Page<Resource>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Resource>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.List");
                 scope.Start();
                 try
                 {
@@ -553,7 +553,7 @@ public virtual Pageable<Resource> List(int? top = null, CancellationToken cancel
         {
             Page<Resource> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.List");
                 scope.Start();
                 try
                 {
@@ -568,7 +568,7 @@ Page<Resource> FirstPageFunc(int? pageSizeHint)
             }
             Page<Resource> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VaultsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VaultsOperations.List");
                 scope.Start();
                 try
                 {
@@ -604,7 +604,7 @@ public virtual async Task<VaultsCreateOrUpdateOperation> StartCreateOrUpdateAsyn
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -638,7 +638,7 @@ public virtual VaultsCreateOrUpdateOperation StartCreateOrUpdate(string resource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual async Task<VaultsPurgeDeletedOperation> StartPurgeDeletedAsync(st
                 throw new ArgumentNullException(nameof(location));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.StartPurgeDeleted");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.StartPurgeDeleted");
             scope.Start();
             try
             {
@@ -696,7 +696,7 @@ public virtual VaultsPurgeDeletedOperation StartPurgeDeleted(string vaultName, s
                 throw new ArgumentNullException(nameof(location));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VaultsClient.StartPurgeDeleted");
+            using var scope = _clientDiagnostics.CreateScope("VaultsOperations.StartPurgeDeleted");
             scope.Start();
             try
             {
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsRestClient.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsRestOperations.cs
similarity index 99%
rename from sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsRestClient.cs
rename to sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsRestOperations.cs
index 6e1a9798f7853..2d64404e693e1 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsRestClient.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/src/Generated/VaultsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.KeyVault
 {
-    internal partial class VaultsRestClient
+    internal partial class VaultsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class VaultsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VaultsRestClient. </summary>
+        /// <summary> Initializes a new instance of VaultsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VaultsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
+        public VaultsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-09-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysOperations.cs
index 8cebb6b182131..a41baef3de872 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysOperations.cs
@@ -17,23 +17,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ApplicationGateways service client. </summary>
-    public partial class ApplicationGatewaysClient
+    public partial class ApplicationGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationGatewaysClient for mocking. </summary>
-        protected ApplicationGatewaysClient()
+        internal ApplicationGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationGatewaysOperations for mocking. </summary>
+        protected ApplicationGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ApplicationGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ApplicationGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ApplicationGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ApplicationGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ApplicationGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGateway>> GetAsync(string resourceGroupName, string applicationGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ApplicationGateway>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGateway> Get(string resourceGroupName, string applicationGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<ApplicationGateway> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGateway>> UpdateTagsAsync(string resourceGroupName, string applicationGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -103,7 +103,7 @@ public virtual async Task<Response<ApplicationGateway>> UpdateTagsAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGateway> UpdateTags(string resourceGroupName, string applicationGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<ApplicationGateway> UpdateTags(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableServerVariablesAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableServerVariables");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableServerVariables");
             scope.Start();
             try
             {
@@ -137,7 +137,7 @@ public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableServerVa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<string>> ListAvailableServerVariables(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableServerVariables");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableServerVariables");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual Response<IReadOnlyList<string>> ListAvailableServerVariables(Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableRequestHeadersAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableRequestHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableRequestHeaders");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableRequestH
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<string>> ListAvailableRequestHeaders(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableRequestHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableRequestHeaders");
             scope.Start();
             try
             {
@@ -188,7 +188,7 @@ public virtual Response<IReadOnlyList<string>> ListAvailableRequestHeaders(Cance
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableResponseHeadersAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableResponseHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableResponseHeaders");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableResponse
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<string>> ListAvailableResponseHeaders(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableResponseHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableResponseHeaders");
             scope.Start();
             try
             {
@@ -222,7 +222,7 @@ public virtual Response<IReadOnlyList<string>> ListAvailableResponseHeaders(Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGatewayAvailableWafRuleSetsResult>> ListAvailableWafRuleSetsAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableWafRuleSets");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableWafRuleSets");
             scope.Start();
             try
             {
@@ -239,7 +239,7 @@ public virtual async Task<Response<ApplicationGatewayAvailableWafRuleSetsResult>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGatewayAvailableWafRuleSetsResult> ListAvailableWafRuleSets(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableWafRuleSets");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableWafRuleSets");
             scope.Start();
             try
             {
@@ -256,7 +256,7 @@ public virtual Response<ApplicationGatewayAvailableWafRuleSetsResult> ListAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGatewayAvailableSslOptions>> ListAvailableSslOptionsAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslOptions");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslOptions");
             scope.Start();
             try
             {
@@ -273,7 +273,7 @@ public virtual async Task<Response<ApplicationGatewayAvailableSslOptions>> ListA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGatewayAvailableSslOptions> ListAvailableSslOptions(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslOptions");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslOptions");
             scope.Start();
             try
             {
@@ -291,7 +291,7 @@ public virtual Response<ApplicationGatewayAvailableSslOptions> ListAvailableSslO
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGatewaySslPredefinedPolicy>> GetSslPredefinedPolicyAsync(string predefinedPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.GetSslPredefinedPolicy");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.GetSslPredefinedPolicy");
             scope.Start();
             try
             {
@@ -309,7 +309,7 @@ public virtual async Task<Response<ApplicationGatewaySslPredefinedPolicy>> GetSs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGatewaySslPredefinedPolicy> GetSslPredefinedPolicy(string predefinedPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.GetSslPredefinedPolicy");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.GetSslPredefinedPolicy");
             scope.Start();
             try
             {
@@ -334,7 +334,7 @@ public virtual AsyncPageable<ApplicationGateway> ListAsync(string resourceGroupN
 
             async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -349,7 +349,7 @@ async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -377,7 +377,7 @@ public virtual Pageable<ApplicationGateway> List(string resourceGroupName, Cance
 
             Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -392,7 +392,7 @@ Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -414,7 +414,7 @@ public virtual AsyncPageable<ApplicationGateway> ListAllAsync(CancellationToken
         {
             async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -429,7 +429,7 @@ async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -451,7 +451,7 @@ public virtual Pageable<ApplicationGateway> ListAll(CancellationToken cancellati
         {
             Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -466,7 +466,7 @@ Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -488,7 +488,7 @@ public virtual AsyncPageable<ApplicationGatewaySslPredefinedPolicy> ListAvailabl
         {
             async Task<Page<ApplicationGatewaySslPredefinedPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -503,7 +503,7 @@ async Task<Page<ApplicationGatewaySslPredefinedPolicy>> FirstPageFunc(int? pageS
             }
             async Task<Page<ApplicationGatewaySslPredefinedPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -525,7 +525,7 @@ public virtual Pageable<ApplicationGatewaySslPredefinedPolicy> ListAvailableSslP
         {
             Page<ApplicationGatewaySslPredefinedPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -540,7 +540,7 @@ Page<ApplicationGatewaySslPredefinedPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationGatewaySslPredefinedPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -571,7 +571,7 @@ public virtual async Task<ApplicationGatewaysDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -600,7 +600,7 @@ public virtual ApplicationGatewaysDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -634,7 +634,7 @@ public virtual async Task<ApplicationGatewaysCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -668,7 +668,7 @@ public virtual ApplicationGatewaysCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -697,7 +697,7 @@ public virtual async Task<ApplicationGatewaysStartOperation> StartStartAsync(str
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStart");
             scope.Start();
             try
             {
@@ -726,7 +726,7 @@ public virtual ApplicationGatewaysStartOperation StartStart(string resourceGroup
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStart");
             scope.Start();
             try
             {
@@ -755,7 +755,7 @@ public virtual async Task<ApplicationGatewaysStopOperation> StartStopAsync(strin
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStop");
             scope.Start();
             try
             {
@@ -784,7 +784,7 @@ public virtual ApplicationGatewaysStopOperation StartStop(string resourceGroupNa
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStop");
             scope.Start();
             try
             {
@@ -814,7 +814,7 @@ public virtual async Task<ApplicationGatewaysBackendHealthOperation> StartBacken
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealth");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealth");
             scope.Start();
             try
             {
@@ -844,7 +844,7 @@ public virtual ApplicationGatewaysBackendHealthOperation StartBackendHealth(stri
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealth");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealth");
             scope.Start();
             try
             {
@@ -879,7 +879,7 @@ public virtual async Task<ApplicationGatewaysBackendHealthOnDemandOperation> Sta
                 throw new ArgumentNullException(nameof(probeRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealthOnDemand");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealthOnDemand");
             scope.Start();
             try
             {
@@ -914,7 +914,7 @@ public virtual ApplicationGatewaysBackendHealthOnDemandOperation StartBackendHea
                 throw new ArgumentNullException(nameof(probeRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealthOnDemand");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealthOnDemand");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysRestOperations.cs
index d2562d7729b7e..3cf6d0106f909 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationGatewaysRestOperations.cs
@@ -17,20 +17,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ApplicationGatewaysRestClient
+    internal partial class ApplicationGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ApplicationGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsOperations.cs
index 8d0ef7cde224f..b42253adff76c 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ApplicationSecurityGroups service client. </summary>
-    public partial class ApplicationSecurityGroupsClient
+    public partial class ApplicationSecurityGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationSecurityGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationSecurityGroupsClient for mocking. </summary>
-        protected ApplicationSecurityGroupsClient()
+        internal ApplicationSecurityGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationSecurityGroupsOperations for mocking. </summary>
+        protected ApplicationSecurityGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationSecurityGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationSecurityGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ApplicationSecurityGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ApplicationSecurityGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ApplicationSecurityGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ApplicationSecurityGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ApplicationSecurityGroupsClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationSecurityGroup>> GetAsync(string resourceGroupName, string applicationSecurityGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ApplicationSecurityGroup>> GetAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationSecurityGroup> Get(string resourceGroupName, string applicationSecurityGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ApplicationSecurityGroup> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string applicationSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ApplicationSecurityGroup>> UpdateTagsAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationSecurityGroup> UpdateTags(string resourceGroupName, string applicationSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<ApplicationSecurityGroup> ListAllAsync(Cancellation
         {
             async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<ApplicationSecurityGroup> ListAll(CancellationToken canc
         {
             Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<ApplicationSecurityGroup> ListAsync(string resource
 
             async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ApplicationSecurityGroup> List(string resourceGroupName,
 
             Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<ApplicationSecurityGroupsDeleteOperation> StartDeleteA
                 throw new ArgumentNullException(nameof(applicationSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual ApplicationSecurityGroupsDeleteOperation StartDelete(string resou
                 throw new ArgumentNullException(nameof(applicationSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<ApplicationSecurityGroupsCreateOrUpdateOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual ApplicationSecurityGroupsCreateOrUpdateOperation StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsRestOperations.cs
index 29a2b875a795d..e83a7fb3a2578 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ApplicationSecurityGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ApplicationSecurityGroupsRestClient
+    internal partial class ApplicationSecurityGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationSecurityGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationSecurityGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationSecurityGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ApplicationSecurityGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsOperations.cs
similarity index 88%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsOperations.cs
index 18ca143afbc40..ffbb4b49dcd76 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AvailableDelegations service client. </summary>
-    public partial class AvailableDelegationsClient
+    public partial class AvailableDelegationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableDelegationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableDelegationsClient for mocking. </summary>
-        protected AvailableDelegationsClient()
+        internal AvailableDelegationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableDelegationsOperations for mocking. </summary>
+        protected AvailableDelegationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableDelegationsClient. </summary>
+        /// <summary> Initializes a new instance of AvailableDelegationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableDelegationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableDelegationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableDelegationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableDelegationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<AvailableDelegation> ListAsync(string location, Can
 
             async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableDelegation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<AvailableDelegation> List(string location, CancellationT
 
             Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableDelegation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsRestOperations.cs
index 0099600131935..a8dbfccb5f5ce 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableDelegationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AvailableDelegationsRestClient
+    internal partial class AvailableDelegationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableDelegationsRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableDelegationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableDelegationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableDelegationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesOperations.cs
similarity index 87%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesOperations.cs
index 8f8d88d63b0b1..e25f40adadae0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AvailableEndpointServices service client. </summary>
-    public partial class AvailableEndpointServicesClient
+    public partial class AvailableEndpointServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableEndpointServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableEndpointServicesClient for mocking. </summary>
-        protected AvailableEndpointServicesClient()
+        internal AvailableEndpointServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableEndpointServicesOperations for mocking. </summary>
+        protected AvailableEndpointServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableEndpointServicesClient. </summary>
+        /// <summary> Initializes a new instance of AvailableEndpointServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableEndpointServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableEndpointServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableEndpointServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableEndpointServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<EndpointServiceResult> ListAsync(string location, C
 
             async Task<Page<EndpointServiceResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<EndpointServiceResult>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<EndpointServiceResult>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<EndpointServiceResult> List(string location, Cancellatio
 
             Page<EndpointServiceResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<EndpointServiceResult> FirstPageFunc(int? pageSizeHint)
             }
             Page<EndpointServiceResult> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesRestOperations.cs
index 8f2a55b7043d0..e167562806805 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableEndpointServicesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AvailableEndpointServicesRestClient
+    internal partial class AvailableEndpointServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableEndpointServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableEndpointServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableEndpointServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableEndpointServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesOperations.cs
similarity index 90%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesOperations.cs
index df3267724d885..f7dd2a679ae24 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AvailablePrivateEndpointTypes service client. </summary>
-    public partial class AvailablePrivateEndpointTypesClient
+    public partial class AvailablePrivateEndpointTypesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailablePrivateEndpointTypesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesClient for mocking. </summary>
-        protected AvailablePrivateEndpointTypesClient()
+        internal AvailablePrivateEndpointTypesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesOperations for mocking. </summary>
+        protected AvailablePrivateEndpointTypesOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesClient. </summary>
+        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailablePrivateEndpointTypesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailablePrivateEndpointTypesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailablePrivateEndpointTypesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailablePrivateEndpointTypesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<AvailablePrivateEndpointType> ListAsync(string loca
 
             async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailablePrivateEndpointType>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<AvailablePrivateEndpointType> List(string location, Canc
 
             Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailablePrivateEndpointType> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -140,7 +140,7 @@ public virtual AsyncPageable<AvailablePrivateEndpointType> ListByResourceGroupAs
 
             async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -155,7 +155,7 @@ async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailablePrivateEndpointType>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -188,7 +188,7 @@ public virtual Pageable<AvailablePrivateEndpointType> ListByResourceGroup(string
 
             Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailablePrivateEndpointType> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesRestOperations.cs
index c34fb9bb7592b..8afc21071bafc 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailablePrivateEndpointTypesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AvailablePrivateEndpointTypesRestClient
+    internal partial class AvailablePrivateEndpointTypesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailablePrivateEndpointTypesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailablePrivateEndpointTypesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsOperations.cs
similarity index 88%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsOperations.cs
index c228361bbf5d1..b177fa6040f9f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AvailableResourceGroupDelegations service client. </summary>
-    public partial class AvailableResourceGroupDelegationsClient
+    public partial class AvailableResourceGroupDelegationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableResourceGroupDelegationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsClient for mocking. </summary>
-        protected AvailableResourceGroupDelegationsClient()
+        internal AvailableResourceGroupDelegationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsOperations for mocking. </summary>
+        protected AvailableResourceGroupDelegationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsClient. </summary>
+        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableResourceGroupDelegationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableResourceGroupDelegationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableResourceGroupDelegationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableResourceGroupDelegationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -54,7 +54,7 @@ public virtual AsyncPageable<AvailableDelegation> ListAsync(string location, str
 
             async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -69,7 +69,7 @@ async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableDelegation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ public virtual Pageable<AvailableDelegation> List(string location, string resour
 
             Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -117,7 +117,7 @@ Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableDelegation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsRestOperations.cs
index 6a23d204afdb3..205f52acba881 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableResourceGroupDelegationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AvailableResourceGroupDelegationsRestClient
+    internal partial class AvailableResourceGroupDelegationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableResourceGroupDelegationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableResourceGroupDelegationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesOperations.cs
similarity index 90%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesOperations.cs
index 105923f2acaf5..a43def6368845 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AvailableServiceAliases service client. </summary>
-    public partial class AvailableServiceAliasesClient
+    public partial class AvailableServiceAliasesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableServiceAliasesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableServiceAliasesClient for mocking. </summary>
-        protected AvailableServiceAliasesClient()
+        internal AvailableServiceAliasesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableServiceAliasesOperations for mocking. </summary>
+        protected AvailableServiceAliasesOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableServiceAliasesClient. </summary>
+        /// <summary> Initializes a new instance of AvailableServiceAliasesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableServiceAliasesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableServiceAliasesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableServiceAliasesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableServiceAliasesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<AvailableServiceAlias> ListAsync(string location, C
 
             async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableServiceAlias>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<AvailableServiceAlias> List(string location, Cancellatio
 
             Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableServiceAlias> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -140,7 +140,7 @@ public virtual AsyncPageable<AvailableServiceAlias> ListByResourceGroupAsync(str
 
             async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -155,7 +155,7 @@ async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableServiceAlias>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -188,7 +188,7 @@ public virtual Pageable<AvailableServiceAlias> ListByResourceGroup(string resour
 
             Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableServiceAlias> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesRestOperations.cs
index a952ea72decbf..948f429a9f127 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AvailableServiceAliasesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AvailableServiceAliasesRestClient
+    internal partial class AvailableServiceAliasesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableServiceAliasesRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableServiceAliasesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableServiceAliasesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableServiceAliasesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsOperations.cs
similarity index 86%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsOperations.cs
index affa41de43adc..a31cd11b9de64 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AzureFirewallFqdnTags service client. </summary>
-    public partial class AzureFirewallFqdnTagsClient
+    public partial class AzureFirewallFqdnTagsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AzureFirewallFqdnTagsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsClient for mocking. </summary>
-        protected AzureFirewallFqdnTagsClient()
+        internal AzureFirewallFqdnTagsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsOperations for mocking. </summary>
+        protected AzureFirewallFqdnTagsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AzureFirewallFqdnTagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AzureFirewallFqdnTagsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AzureFirewallFqdnTagsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AzureFirewallFqdnTagsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<AzureFirewallFqdnTag> ListAllAsync(CancellationToke
         {
             async Task<Page<AzureFirewallFqdnTag>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<AzureFirewallFqdnTag>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AzureFirewallFqdnTag>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<AzureFirewallFqdnTag> ListAll(CancellationToken cancella
         {
             Page<AzureFirewallFqdnTag> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<AzureFirewallFqdnTag> FirstPageFunc(int? pageSizeHint)
             }
             Page<AzureFirewallFqdnTag> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsRestOperations.cs
index 84909e3066bff..11293af771b05 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallFqdnTagsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AzureFirewallFqdnTagsRestClient
+    internal partial class AzureFirewallFqdnTagsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsRestClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AzureFirewallFqdnTagsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AzureFirewallFqdnTagsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsOperations.cs
index 0dbef36a8533b..1a0d44af61a17 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The AzureFirewalls service client. </summary>
-    public partial class AzureFirewallsClient
+    public partial class AzureFirewallsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AzureFirewallsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AzureFirewallsClient for mocking. </summary>
-        protected AzureFirewallsClient()
+        internal AzureFirewallsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AzureFirewallsOperations for mocking. </summary>
+        protected AzureFirewallsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AzureFirewallsClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AzureFirewallsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AzureFirewallsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AzureFirewallsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AzureFirewallsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal AzureFirewallsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AzureFirewall>> GetAsync(string resourceGroupName, string azureFirewallName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<AzureFirewall>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AzureFirewall> Get(string resourceGroupName, string azureFirewallName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<AzureFirewall> ListAsync(string resourceGroupName,
 
             async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AzureFirewall>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<AzureFirewall> List(string resourceGroupName, Cancellati
 
             Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             }
             Page<AzureFirewall> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<AzureFirewall> ListAllAsync(CancellationToken cance
         {
             async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AzureFirewall>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<AzureFirewall> ListAll(CancellationToken cancellationTok
         {
             Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             }
             Page<AzureFirewall> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -250,7 +250,7 @@ public virtual async Task<AzureFirewallsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(azureFirewallName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -279,7 +279,7 @@ public virtual AzureFirewallsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(azureFirewallName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -313,7 +313,7 @@ public virtual async Task<AzureFirewallsCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual AzureFirewallsCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -381,7 +381,7 @@ public virtual async Task<AzureFirewallsUpdateTagsOperation> StartUpdateTagsAsyn
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual AzureFirewallsUpdateTagsOperation StartUpdateTags(string resource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartUpdateTags");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsRestOperations.cs
index 46b87642a764c..5ee057c81f541 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/AzureFirewallsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class AzureFirewallsRestClient
+    internal partial class AzureFirewallsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AzureFirewallsRestClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AzureFirewallsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AzureFirewallsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsOperations.cs
index bff360101e226..82cd861b46327 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The BastionHosts service client. </summary>
-    public partial class BastionHostsClient
+    public partial class BastionHostsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BastionHostsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BastionHostsClient for mocking. </summary>
-        protected BastionHostsClient()
+        internal BastionHostsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BastionHostsOperations for mocking. </summary>
+        protected BastionHostsOperations()
         {
         }
-        /// <summary> Initializes a new instance of BastionHostsClient. </summary>
+        /// <summary> Initializes a new instance of BastionHostsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal BastionHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal BastionHostsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new BastionHostsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new BastionHostsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal BastionHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BastionHost>> GetAsync(string resourceGroupName, string bastionHostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<BastionHost>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BastionHost> Get(string resourceGroupName, string bastionHostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual AsyncPageable<BastionHost> ListAsync(CancellationToken cancellati
         {
             async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -96,7 +96,7 @@ async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionHost>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -118,7 +118,7 @@ public virtual Pageable<BastionHost> List(CancellationToken cancellationToken =
         {
             Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -133,7 +133,7 @@ Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionHost> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -161,7 +161,7 @@ public virtual AsyncPageable<BastionHost> ListByResourceGroupAsync(string resour
 
             async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -176,7 +176,7 @@ async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionHost>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<BastionHost> ListByResourceGroup(string resourceGroupNam
 
             Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionHost> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -250,7 +250,7 @@ public virtual async Task<BastionHostsDeleteOperation> StartDeleteAsync(string r
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -279,7 +279,7 @@ public virtual BastionHostsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -313,7 +313,7 @@ public virtual async Task<BastionHostsCreateOrUpdateOperation> StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual BastionHostsCreateOrUpdateOperation StartCreateOrUpdate(string re
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsRestOperations.cs
index a4ebe8894b415..0b20aadfe4250 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/BastionHostsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class BastionHostsRestClient
+    internal partial class BastionHostsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BastionHostsRestClient. </summary>
+        /// <summary> Initializes a new instance of BastionHostsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BastionHostsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public BastionHostsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesOperations.cs
similarity index 86%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesOperations.cs
index 469e578816c3d..6bbef9ed19fe6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The BgpServiceCommunities service client. </summary>
-    public partial class BgpServiceCommunitiesClient
+    public partial class BgpServiceCommunitiesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BgpServiceCommunitiesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BgpServiceCommunitiesClient for mocking. </summary>
-        protected BgpServiceCommunitiesClient()
+        internal BgpServiceCommunitiesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BgpServiceCommunitiesOperations for mocking. </summary>
+        protected BgpServiceCommunitiesOperations()
         {
         }
-        /// <summary> Initializes a new instance of BgpServiceCommunitiesClient. </summary>
+        /// <summary> Initializes a new instance of BgpServiceCommunitiesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal BgpServiceCommunitiesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal BgpServiceCommunitiesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new BgpServiceCommunitiesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new BgpServiceCommunitiesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<BgpServiceCommunity> ListAsync(CancellationToken ca
         {
             async Task<Page<BgpServiceCommunity>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<BgpServiceCommunity>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BgpServiceCommunity>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<BgpServiceCommunity> List(CancellationToken cancellation
         {
             Page<BgpServiceCommunity> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<BgpServiceCommunity> FirstPageFunc(int? pageSizeHint)
             }
             Page<BgpServiceCommunity> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesRestOperations.cs
index fa7c6f7fb8bdd..c4e8eff382fd6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/BgpServiceCommunitiesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class BgpServiceCommunitiesRestClient
+    internal partial class BgpServiceCommunitiesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BgpServiceCommunitiesRestClient. </summary>
+        /// <summary> Initializes a new instance of BgpServiceCommunitiesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BgpServiceCommunitiesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public BgpServiceCommunitiesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsOperations.cs
index b078c76f98f0d..73b0257b2d82d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ConnectionMonitors service client. </summary>
-    public partial class ConnectionMonitorsClient
+    public partial class ConnectionMonitorsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ConnectionMonitorsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ConnectionMonitorsClient for mocking. </summary>
-        protected ConnectionMonitorsClient()
+        internal ConnectionMonitorsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ConnectionMonitorsOperations for mocking. </summary>
+        protected ConnectionMonitorsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ConnectionMonitorsClient. </summary>
+        /// <summary> Initializes a new instance of ConnectionMonitorsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ConnectionMonitorsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ConnectionMonitorsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ConnectionMonitorsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ConnectionMonitorsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ConnectionMonitorsClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConnectionMonitorResult>> GetAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ConnectionMonitorResult>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConnectionMonitorResult> Get(string resourceGroupName, string networkWatcherName, string connectionMonitorName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<ConnectionMonitorResult> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConnectionMonitorResult>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -106,7 +106,7 @@ public virtual async Task<Response<ConnectionMonitorResult>> UpdateTagsAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConnectionMonitorResult> UpdateTags(string resourceGroupName, string networkWatcherName, string connectionMonitorName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -136,7 +136,7 @@ public virtual AsyncPageable<ConnectionMonitorResult> ListAsync(string resourceG
 
             async Task<Page<ConnectionMonitorResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual Pageable<ConnectionMonitorResult> List(string resourceGroupName,
 
             Page<ConnectionMonitorResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual async Task<ConnectionMonitorsCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -249,7 +249,7 @@ public virtual ConnectionMonitorsCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -283,7 +283,7 @@ public virtual async Task<ConnectionMonitorsDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual ConnectionMonitorsDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -351,7 +351,7 @@ public virtual async Task<ConnectionMonitorsStopOperation> StartStopAsync(string
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStop");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual ConnectionMonitorsStopOperation StartStop(string resourceGroupNam
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStop");
             scope.Start();
             try
             {
@@ -419,7 +419,7 @@ public virtual async Task<ConnectionMonitorsStartOperation> StartStartAsync(stri
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStart");
             scope.Start();
             try
             {
@@ -453,7 +453,7 @@ public virtual ConnectionMonitorsStartOperation StartStart(string resourceGroupN
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStart");
             scope.Start();
             try
             {
@@ -487,7 +487,7 @@ public virtual async Task<ConnectionMonitorsQueryOperation> StartQueryAsync(stri
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartQuery");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartQuery");
             scope.Start();
             try
             {
@@ -521,7 +521,7 @@ public virtual ConnectionMonitorsQueryOperation StartQuery(string resourceGroupN
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartQuery");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartQuery");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsRestOperations.cs
index d099bcb487629..af2a3fae98d50 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ConnectionMonitorsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ConnectionMonitorsRestClient
+    internal partial class ConnectionMonitorsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ConnectionMonitorsRestClient. </summary>
+        /// <summary> Initializes a new instance of ConnectionMonitorsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ConnectionMonitorsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ConnectionMonitorsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesOperations.cs
index f63ddff9bc46d..82635f9c7341e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The DdosCustomPolicies service client. </summary>
-    public partial class DdosCustomPoliciesClient
+    public partial class DdosCustomPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DdosCustomPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DdosCustomPoliciesClient for mocking. </summary>
-        protected DdosCustomPoliciesClient()
+        internal DdosCustomPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DdosCustomPoliciesOperations for mocking. </summary>
+        protected DdosCustomPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of DdosCustomPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of DdosCustomPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DdosCustomPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DdosCustomPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DdosCustomPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DdosCustomPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal DdosCustomPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosCustomPolicy>> GetAsync(string resourceGroupName, string ddosCustomPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<DdosCustomPolicy>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosCustomPolicy> Get(string resourceGroupName, string ddosCustomPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<DdosCustomPolicy> Get(string resourceGroupName, string d
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosCustomPolicy>> UpdateTagsAsync(string resourceGroupName, string ddosCustomPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<DdosCustomPolicy>> UpdateTagsAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosCustomPolicy> UpdateTags(string resourceGroupName, string ddosCustomPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual async Task<DdosCustomPoliciesDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(ddosCustomPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -158,7 +158,7 @@ public virtual DdosCustomPoliciesDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(ddosCustomPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -192,7 +192,7 @@ public virtual async Task<DdosCustomPoliciesCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -226,7 +226,7 @@ public virtual DdosCustomPoliciesCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesRestOperations.cs
index c337d9a6619f4..828c15250199a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosCustomPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class DdosCustomPoliciesRestClient
+    internal partial class DdosCustomPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DdosCustomPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of DdosCustomPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DdosCustomPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DdosCustomPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansOperations.cs
index f32472bf079c8..518b5e900f5e9 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The DdosProtectionPlans service client. </summary>
-    public partial class DdosProtectionPlansClient
+    public partial class DdosProtectionPlansOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DdosProtectionPlansRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DdosProtectionPlansClient for mocking. </summary>
-        protected DdosProtectionPlansClient()
+        internal DdosProtectionPlansRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DdosProtectionPlansOperations for mocking. </summary>
+        protected DdosProtectionPlansOperations()
         {
         }
-        /// <summary> Initializes a new instance of DdosProtectionPlansClient. </summary>
+        /// <summary> Initializes a new instance of DdosProtectionPlansOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DdosProtectionPlansClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DdosProtectionPlansOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DdosProtectionPlansRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DdosProtectionPlansRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DdosProtectionPlansClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosProtectionPlan>> GetAsync(string resourceGroupName, string ddosProtectionPlanName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<DdosProtectionPlan>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosProtectionPlan> Get(string resourceGroupName, string ddosProtectionPlanName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<DdosProtectionPlan> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosProtectionPlan>> UpdateTagsAsync(string resourceGroupName, string ddosProtectionPlanName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<DdosProtectionPlan>> UpdateTagsAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosProtectionPlan> UpdateTags(string resourceGroupName, string ddosProtectionPlanName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<DdosProtectionPlan> ListAsync(CancellationToken can
         {
             async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DdosProtectionPlan>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<DdosProtectionPlan> List(CancellationToken cancellationT
         {
             Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             }
             Page<DdosProtectionPlan> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<DdosProtectionPlan> ListByResourceGroupAsync(string
 
             async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DdosProtectionPlan>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<DdosProtectionPlan> ListByResourceGroup(string resourceG
 
             Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             }
             Page<DdosProtectionPlan> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<DdosProtectionPlansDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(ddosProtectionPlanName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual DdosProtectionPlansDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(ddosProtectionPlanName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<DdosProtectionPlansCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual DdosProtectionPlansCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansRestOperations.cs
index 52d45c408477b..556a53c0eee68 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/DdosProtectionPlansRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class DdosProtectionPlansRestClient
+    internal partial class DdosProtectionPlansRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DdosProtectionPlansRestClient. </summary>
+        /// <summary> Initializes a new instance of DdosProtectionPlansRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DdosProtectionPlansRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DdosProtectionPlansRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesOperations.cs
similarity index 91%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesOperations.cs
index d2de692a13e7c..448c7efecd1b2 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The DefaultSecurityRules service client. </summary>
-    public partial class DefaultSecurityRulesClient
+    public partial class DefaultSecurityRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DefaultSecurityRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DefaultSecurityRulesClient for mocking. </summary>
-        protected DefaultSecurityRulesClient()
+        internal DefaultSecurityRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DefaultSecurityRulesOperations for mocking. </summary>
+        protected DefaultSecurityRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of DefaultSecurityRulesClient. </summary>
+        /// <summary> Initializes a new instance of DefaultSecurityRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DefaultSecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DefaultSecurityRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DefaultSecurityRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DefaultSecurityRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DefaultSecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<SecurityRule> ListAsync(string resourceGroupName, s
 
             async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<SecurityRule> List(string resourceGroupName, string netw
 
             Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesRestOperations.cs
index a1dc1f8c36c85..d4b701aae206d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/DefaultSecurityRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class DefaultSecurityRulesRestClient
+    internal partial class DefaultSecurityRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DefaultSecurityRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of DefaultSecurityRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DefaultSecurityRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DefaultSecurityRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsOperations.cs
index 53e7c1981cea5..5122757e636dd 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteCircuitAuthorizations service client. </summary>
-    public partial class ExpressRouteCircuitAuthorizationsClient
+    public partial class ExpressRouteCircuitAuthorizationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitAuthorizationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsClient for mocking. </summary>
-        protected ExpressRouteCircuitAuthorizationsClient()
+        internal ExpressRouteCircuitAuthorizationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsOperations for mocking. </summary>
+        protected ExpressRouteCircuitAuthorizationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitAuthorizationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitAuthorizationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitAuthorizationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitAuthorizationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteCircuitAuthorizationsClient(ClientDiagnostics clientDiagnos
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitAuthorization>> GetAsync(string resourceGroupName, string circuitName, string authorizationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteCircuitAuthorization>> GetAsync(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitAuthorization> Get(string resourceGroupName, string circuitName, string authorizationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteCircuitAuthorization> ListAsync(string
 
             async Task<Page<ExpressRouteCircuitAuthorization>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteCircuitAuthorization>> FirstPageFunc(int? pageSizeHi
             }
             async Task<Page<ExpressRouteCircuitAuthorization>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteCircuitAuthorization> List(string resourceGr
 
             Page<ExpressRouteCircuitAuthorization> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteCircuitAuthorization> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuitAuthorization> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ExpressRouteCircuitAuthorizationsDeleteOperation> Star
                 throw new ArgumentNullException(nameof(authorizationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ExpressRouteCircuitAuthorizationsDeleteOperation StartDelete(stri
                 throw new ArgumentNullException(nameof(authorizationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ExpressRouteCircuitAuthorizationsCreateOrUpdateOperati
                 throw new ArgumentNullException(nameof(authorizationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation StartCre
                 throw new ArgumentNullException(nameof(authorizationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsRestOperations.cs
index d297d8ae4366e..a5cbc15f36147 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitAuthorizationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteCircuitAuthorizationsRestClient
+    internal partial class ExpressRouteCircuitAuthorizationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitAuthorizationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitAuthorizationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsOperations.cs
index 6ef9e0961d7bf..12a9d9585540a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteCircuitConnections service client. </summary>
-    public partial class ExpressRouteCircuitConnectionsClient
+    public partial class ExpressRouteCircuitConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsClient for mocking. </summary>
-        protected ExpressRouteCircuitConnectionsClient()
+        internal ExpressRouteCircuitConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsOperations for mocking. </summary>
+        protected ExpressRouteCircuitConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal ExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagnostic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<ExpressRouteCircuitConnection>> GetAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<ExpressRouteCircuitConnection> ListAsync(string res
 
             async Task<Page<ExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<ExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuitConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<ExpressRouteCircuitConnection> List(string resourceGroup
 
             Page<ExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<ExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuitConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual async Task<ExpressRouteCircuitConnectionsDeleteOperation> StartDe
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -249,7 +249,7 @@ public virtual ExpressRouteCircuitConnectionsDeleteOperation StartDelete(string
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -293,7 +293,7 @@ public virtual async Task<ExpressRouteCircuitConnectionsCreateOrUpdateOperation>
                 throw new ArgumentNullException(nameof(expressRouteCircuitConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -337,7 +337,7 @@ public virtual ExpressRouteCircuitConnectionsCreateOrUpdateOperation StartCreate
                 throw new ArgumentNullException(nameof(expressRouteCircuitConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsRestOperations.cs
index ae2b15b766545..45ae3d59cceaa 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteCircuitConnectionsRestClient
+    internal partial class ExpressRouteCircuitConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsOperations.cs
index b3ea38e912612..b5338b2f82273 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteCircuitPeerings service client. </summary>
-    public partial class ExpressRouteCircuitPeeringsClient
+    public partial class ExpressRouteCircuitPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsClient for mocking. </summary>
-        protected ExpressRouteCircuitPeeringsClient()
+        internal ExpressRouteCircuitPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsOperations for mocking. </summary>
+        protected ExpressRouteCircuitPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteCircuitPeeringsClient(ClientDiagnostics clientDiagnostics,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitPeering>> GetAsync(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteCircuitPeering>> GetAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitPeering> Get(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteCircuitPeering> ListAsync(string resour
 
             async Task<Page<ExpressRouteCircuitPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteCircuitPeering>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuitPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteCircuitPeering> List(string resourceGroupNam
 
             Page<ExpressRouteCircuitPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteCircuitPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuitPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ExpressRouteCircuitPeeringsDeleteOperation> StartDelet
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ExpressRouteCircuitPeeringsDeleteOperation StartDelete(string res
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ExpressRouteCircuitPeeringsCreateOrUpdateOperation> St
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ExpressRouteCircuitPeeringsCreateOrUpdateOperation StartCreateOrU
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsRestOperations.cs
index 82c9d5f58b75e..829260c14c11e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteCircuitPeeringsRestClient
+    internal partial class ExpressRouteCircuitPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsOperations.cs
index 8544a4d65554e..5e2341bfbc6af 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteCircuits service client. </summary>
-    public partial class ExpressRouteCircuitsClient
+    public partial class ExpressRouteCircuitsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitsClient for mocking. </summary>
-        protected ExpressRouteCircuitsClient()
+        internal ExpressRouteCircuitsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitsOperations for mocking. </summary>
+        protected ExpressRouteCircuitsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRouteCircuitsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuit>> GetAsync(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ExpressRouteCircuit>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuit> Get(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRouteCircuit> Get(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuit>> UpdateTagsAsync(string resourceGroupName, string circuitName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ExpressRouteCircuit>> UpdateTagsAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuit> UpdateTags(string resourceGroupName, string circuitName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<ExpressRouteCircuit> UpdateTags(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitStats>> GetStatsAsync(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetStats");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<ExpressRouteCircuitStats>> GetStatsAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitStats> GetStats(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetStats");
             scope.Start();
             try
             {
@@ -160,7 +160,7 @@ public virtual Response<ExpressRouteCircuitStats> GetStats(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitStats>> GetPeeringStatsAsync(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetPeeringStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetPeeringStats");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<ExpressRouteCircuitStats>> GetPeeringStatsAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitStats> GetPeeringStats(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetPeeringStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetPeeringStats");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual AsyncPageable<ExpressRouteCircuit> ListAsync(string resourceGroup
 
             async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -220,7 +220,7 @@ async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuit>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual Pageable<ExpressRouteCircuit> List(string resourceGroupName, Canc
 
             Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuit> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -285,7 +285,7 @@ public virtual AsyncPageable<ExpressRouteCircuit> ListAllAsync(CancellationToken
         {
             async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -300,7 +300,7 @@ async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuit>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -322,7 +322,7 @@ public virtual Pageable<ExpressRouteCircuit> ListAll(CancellationToken cancellat
         {
             Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -337,7 +337,7 @@ Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuit> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -368,7 +368,7 @@ public virtual async Task<ExpressRouteCircuitsDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(circuitName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -397,7 +397,7 @@ public virtual ExpressRouteCircuitsDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(circuitName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -431,7 +431,7 @@ public virtual async Task<ExpressRouteCircuitsCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -465,7 +465,7 @@ public virtual ExpressRouteCircuitsCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -504,7 +504,7 @@ public virtual async Task<ExpressRouteCircuitsListArpTableOperation> StartListAr
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -543,7 +543,7 @@ public virtual ExpressRouteCircuitsListArpTableOperation StartListArpTable(strin
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -582,7 +582,7 @@ public virtual async Task<ExpressRouteCircuitsListRoutesTableOperation> StartLis
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
@@ -621,7 +621,7 @@ public virtual ExpressRouteCircuitsListRoutesTableOperation StartListRoutesTable
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
@@ -660,7 +660,7 @@ public virtual async Task<ExpressRouteCircuitsListRoutesTableSummaryOperation> S
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
@@ -699,7 +699,7 @@ public virtual ExpressRouteCircuitsListRoutesTableSummaryOperation StartListRout
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsRestOperations.cs
index 1df1a26dcc342..736f10ef3d772 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCircuitsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteCircuitsRestClient
+    internal partial class ExpressRouteCircuitsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsOperations.cs
index 5b5c7af341793..aedebf26853e6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteConnections service client. </summary>
-    public partial class ExpressRouteConnectionsClient
+    public partial class ExpressRouteConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteConnectionsClient for mocking. </summary>
-        protected ExpressRouteConnectionsClient()
+        internal ExpressRouteConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteConnectionsOperations for mocking. </summary>
+        protected ExpressRouteConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRouteConnectionsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteConnection>> GetAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ExpressRouteConnection>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteConnection> Get(string resourceGroupName, string expressRouteGatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRouteConnection> Get(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteConnectionList>> ListAsync(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.List");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<ExpressRouteConnectionList>> ListAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteConnectionList> List(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.List");
             scope.Start();
             try
             {
@@ -139,7 +139,7 @@ public virtual async Task<ExpressRouteConnectionsCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(putExpressRouteConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -178,7 +178,7 @@ public virtual ExpressRouteConnectionsCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(putExpressRouteConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -212,7 +212,7 @@ public virtual async Task<ExpressRouteConnectionsDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -246,7 +246,7 @@ public virtual ExpressRouteConnectionsDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsRestOperations.cs
index 996786c39233e..5f14dd755060b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteConnectionsRestClient
+    internal partial class ExpressRouteConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsOperations.cs
index 637a43ea6cb9d..1bbba09f12202 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteCrossConnectionPeerings service client. </summary>
-    public partial class ExpressRouteCrossConnectionPeeringsClient
+    public partial class ExpressRouteCrossConnectionPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCrossConnectionPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsClient for mocking. </summary>
-        protected ExpressRouteCrossConnectionPeeringsClient()
+        internal ExpressRouteCrossConnectionPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsOperations for mocking. </summary>
+        protected ExpressRouteCrossConnectionPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCrossConnectionPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCrossConnectionPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCrossConnectionPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCrossConnectionPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteCrossConnectionPeeringsClient(ClientDiagnostics clientDiagn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCrossConnectionPeering>> GetAsync(string resourceGroupName, string crossConnectionName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteCrossConnectionPeering>> GetAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCrossConnectionPeering> Get(string resourceGroupName, string crossConnectionName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteCrossConnectionPeering> ListAsync(strin
 
             async Task<Page<ExpressRouteCrossConnectionPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteCrossConnectionPeering>> FirstPageFunc(int? pageSize
             }
             async Task<Page<ExpressRouteCrossConnectionPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteCrossConnectionPeering> List(string resource
 
             Page<ExpressRouteCrossConnectionPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteCrossConnectionPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCrossConnectionPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ExpressRouteCrossConnectionPeeringsDeleteOperation> St
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ExpressRouteCrossConnectionPeeringsDeleteOperation StartDelete(st
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ExpressRouteCrossConnectionPeeringsCreateOrUpdateOpera
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation StartC
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsRestOperations.cs
index 29510c5955034..1e51d9d939ce3 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteCrossConnectionPeeringsRestClient
+    internal partial class ExpressRouteCrossConnectionPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCrossConnectionPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCrossConnectionPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsOperations.cs
index 402e076608f03..7aaa61e3356cc 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteCrossConnections service client. </summary>
-    public partial class ExpressRouteCrossConnectionsClient
+    public partial class ExpressRouteCrossConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCrossConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsClient for mocking. </summary>
-        protected ExpressRouteCrossConnectionsClient()
+        internal ExpressRouteCrossConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsOperations for mocking. </summary>
+        protected ExpressRouteCrossConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCrossConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCrossConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCrossConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCrossConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRouteCrossConnectionsClient(ClientDiagnostics clientDiagnostics,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCrossConnection>> GetAsync(string resourceGroupName, string crossConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ExpressRouteCrossConnection>> GetAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCrossConnection> Get(string resourceGroupName, string crossConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRouteCrossConnection> Get(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCrossConnection>> UpdateTagsAsync(string resourceGroupName, string crossConnectionName, TagsObject crossConnectionParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ExpressRouteCrossConnection>> UpdateTagsAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCrossConnection> UpdateTags(string resourceGroupName, string crossConnectionName, TagsObject crossConnectionParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<ExpressRouteCrossConnection> ListAsync(Cancellation
         {
             async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCrossConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<ExpressRouteCrossConnection> List(CancellationToken canc
         {
             Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCrossConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<ExpressRouteCrossConnection> ListByResourceGroupAsy
 
             async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCrossConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ExpressRouteCrossConnection> ListByResourceGroup(string
 
             Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCrossConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<ExpressRouteCrossConnectionsCreateOrUpdateOperation> S
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual ExpressRouteCrossConnectionsCreateOrUpdateOperation StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -368,7 +368,7 @@ public virtual async Task<ExpressRouteCrossConnectionsListArpTableOperation> Sta
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -407,7 +407,7 @@ public virtual ExpressRouteCrossConnectionsListArpTableOperation StartListArpTab
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -446,7 +446,7 @@ public virtual async Task<ExpressRouteCrossConnectionsListRoutesTableSummaryOper
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
@@ -485,7 +485,7 @@ public virtual ExpressRouteCrossConnectionsListRoutesTableSummaryOperation Start
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
@@ -524,7 +524,7 @@ public virtual async Task<ExpressRouteCrossConnectionsListRoutesTableOperation>
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
@@ -563,7 +563,7 @@ public virtual ExpressRouteCrossConnectionsListRoutesTableOperation StartListRou
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsRestOperations.cs
index f22a35aaab29c..be50e7954322f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteCrossConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteCrossConnectionsRestClient
+    internal partial class ExpressRouteCrossConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCrossConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCrossConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysOperations.cs
similarity index 92%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysOperations.cs
index a45bfbce948c6..66bb1566e60fb 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteGateways service client. </summary>
-    public partial class ExpressRouteGatewaysClient
+    public partial class ExpressRouteGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteGatewaysClient for mocking. </summary>
-        protected ExpressRouteGatewaysClient()
+        internal ExpressRouteGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteGatewaysOperations for mocking. </summary>
+        protected ExpressRouteGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -40,7 +40,7 @@ internal ExpressRouteGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteGatewayList>> ListBySubscriptionAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListBySubscription");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListBySubscription");
             scope.Start();
             try
             {
@@ -57,7 +57,7 @@ public virtual async Task<Response<ExpressRouteGatewayList>> ListBySubscriptionA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteGatewayList> ListBySubscription(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListBySubscription");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListBySubscription");
             scope.Start();
             try
             {
@@ -75,7 +75,7 @@ public virtual Response<ExpressRouteGatewayList> ListBySubscription(Cancellation
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteGatewayList>> ListByResourceGroupAsync(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListByResourceGroup");
             scope.Start();
             try
             {
@@ -93,7 +93,7 @@ public virtual async Task<Response<ExpressRouteGatewayList>> ListByResourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteGatewayList> ListByResourceGroup(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListByResourceGroup");
             scope.Start();
             try
             {
@@ -112,7 +112,7 @@ public virtual Response<ExpressRouteGatewayList> ListByResourceGroup(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteGateway>> GetAsync(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -131,7 +131,7 @@ public virtual async Task<Response<ExpressRouteGateway>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteGateway> Get(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -164,7 +164,7 @@ public virtual async Task<ExpressRouteGatewaysCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(putExpressRouteGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -198,7 +198,7 @@ public virtual ExpressRouteGatewaysCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(putExpressRouteGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual async Task<ExpressRouteGatewaysDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(expressRouteGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -256,7 +256,7 @@ public virtual ExpressRouteGatewaysDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(expressRouteGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysRestOperations.cs
index e8979644c6ac1..c3be4e50f4d6d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteGatewaysRestClient
+    internal partial class ExpressRouteGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksOperations.cs
similarity index 91%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksOperations.cs
index 5eba8fbcd3c03..aca938f05a2bf 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteLinks service client. </summary>
-    public partial class ExpressRouteLinksClient
+    public partial class ExpressRouteLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteLinksClient for mocking. </summary>
-        protected ExpressRouteLinksClient()
+        internal ExpressRouteLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteLinksOperations for mocking. </summary>
+        protected ExpressRouteLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteLinksClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteLink>> GetAsync(string resourceGroupName, string expressRoutePortName, string linkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteLink>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteLink> Get(string resourceGroupName, string expressRoutePortName, string linkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteLink> ListAsync(string resourceGroupNam
 
             async Task<Page<ExpressRouteLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteLink> List(string resourceGroupName, string
 
             Page<ExpressRouteLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksRestOperations.cs
index 49e9dc0ec1d3e..69b20b62ee448 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteLinksRestClient
+    internal partial class ExpressRouteLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsOperations.cs
similarity index 88%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsOperations.cs
index a89b546af5763..0c035bbd2dfe8 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRoutePortsLocations service client. </summary>
-    public partial class ExpressRoutePortsLocationsClient
+    public partial class ExpressRoutePortsLocationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRoutePortsLocationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsClient for mocking. </summary>
-        protected ExpressRoutePortsLocationsClient()
+        internal ExpressRoutePortsLocationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsOperations for mocking. </summary>
+        protected ExpressRoutePortsLocationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRoutePortsLocationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRoutePortsLocationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRoutePortsLocationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRoutePortsLocationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal ExpressRoutePortsLocationsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRoutePortsLocation>> GetAsync(string locationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.Get");
             scope.Start();
             try
             {
@@ -60,7 +60,7 @@ public virtual async Task<Response<ExpressRoutePortsLocation>> GetAsync(string l
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRoutePortsLocation> Get(string locationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.Get");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual AsyncPageable<ExpressRoutePortsLocation> ListAsync(CancellationTo
         {
             async Task<Page<ExpressRoutePortsLocation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ async Task<Page<ExpressRoutePortsLocation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRoutePortsLocation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ public virtual Pageable<ExpressRoutePortsLocation> List(CancellationToken cancel
         {
             Page<ExpressRoutePortsLocation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -131,7 +131,7 @@ Page<ExpressRoutePortsLocation> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRoutePortsLocation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsRestOperations.cs
index db594400d6735..9869b58f1457e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsLocationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRoutePortsLocationsRestClient
+    internal partial class ExpressRoutePortsLocationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRoutePortsLocationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRoutePortsLocationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsOperations.cs
index 59893e299ae15..32689a3ab5f95 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRoutePorts service client. </summary>
-    public partial class ExpressRoutePortsClient
+    public partial class ExpressRoutePortsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRoutePortsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRoutePortsClient for mocking. </summary>
-        protected ExpressRoutePortsClient()
+        internal ExpressRoutePortsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRoutePortsOperations for mocking. </summary>
+        protected ExpressRoutePortsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRoutePortsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRoutePortsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRoutePortsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRoutePortsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRoutePortsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRoutePortsClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRoutePort>> GetAsync(string resourceGroupName, string expressRoutePortName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ExpressRoutePort>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRoutePort> Get(string resourceGroupName, string expressRoutePortName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRoutePort> Get(string resourceGroupName, string e
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRoutePort>> UpdateTagsAsync(string resourceGroupName, string expressRoutePortName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ExpressRoutePort>> UpdateTagsAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRoutePort> UpdateTags(string resourceGroupName, string expressRoutePortName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<ExpressRoutePort> ListByResourceGroupAsync(string r
 
             async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRoutePort>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<ExpressRoutePort> ListByResourceGroup(string resourceGro
 
             Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRoutePort> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<ExpressRoutePort> ListAsync(CancellationToken cance
         {
             async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRoutePort>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ExpressRoutePort> List(CancellationToken cancellationTok
         {
             Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRoutePort> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<ExpressRoutePortsDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(expressRoutePortName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual ExpressRoutePortsDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(expressRoutePortName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<ExpressRoutePortsCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual ExpressRoutePortsCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsRestOperations.cs
index 965b39544e14a..e9aa8788e3da9 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRoutePortsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRoutePortsRestClient
+    internal partial class ExpressRoutePortsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRoutePortsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRoutePortsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRoutePortsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersOperations.cs
similarity index 85%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersOperations.cs
index 40c5524db9203..59ccf7e7f0e6b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ExpressRouteServiceProviders service client. </summary>
-    public partial class ExpressRouteServiceProvidersClient
+    public partial class ExpressRouteServiceProvidersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteServiceProvidersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersClient for mocking. </summary>
-        protected ExpressRouteServiceProvidersClient()
+        internal ExpressRouteServiceProvidersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersOperations for mocking. </summary>
+        protected ExpressRouteServiceProvidersOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteServiceProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteServiceProvidersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteServiceProvidersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteServiceProvidersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<ExpressRouteServiceProvider> ListAsync(Cancellation
         {
             async Task<Page<ExpressRouteServiceProvider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<ExpressRouteServiceProvider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteServiceProvider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<ExpressRouteServiceProvider> List(CancellationToken canc
         {
             Page<ExpressRouteServiceProvider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<ExpressRouteServiceProvider> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteServiceProvider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersRestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersRestOperations.cs
index 11b5cdd20a4b5..5de865fe83366 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ExpressRouteServiceProvidersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ExpressRouteServiceProvidersRestClient
+    internal partial class ExpressRouteServiceProvidersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteServiceProvidersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteServiceProvidersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesOperations.cs
index 9b6425db6ca71..72b48928da3c8 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The FirewallPolicies service client. </summary>
-    public partial class FirewallPoliciesClient
+    public partial class FirewallPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FirewallPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FirewallPoliciesClient for mocking. </summary>
-        protected FirewallPoliciesClient()
+        internal FirewallPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FirewallPoliciesOperations for mocking. </summary>
+        protected FirewallPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FirewallPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FirewallPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FirewallPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FirewallPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FirewallPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal FirewallPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FirewallPolicy>> GetAsync(string resourceGroupName, string firewallPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FirewallPolicy>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FirewallPolicy> Get(string resourceGroupName, string firewallPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<FirewallPolicy> ListAsync(string resourceGroupName,
 
             async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<FirewallPolicy> List(string resourceGroupName, Cancellat
 
             Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<FirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<FirewallPolicy> ListAllAsync(CancellationToken canc
         {
             async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<FirewallPolicy> ListAll(CancellationToken cancellationTo
         {
             Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<FirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ public virtual async Task<FirewallPoliciesDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(firewallPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -281,7 +281,7 @@ public virtual FirewallPoliciesDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(firewallPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual async Task<FirewallPoliciesCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual FirewallPoliciesCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesRestOperations.cs
index e28c41669b25e..65657c35dfc76 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class FirewallPoliciesRestClient
+    internal partial class FirewallPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FirewallPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FirewallPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FirewallPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsOperations.cs
index fa567d8ddf85e..31ad2d609b2e7 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The FirewallPolicyRuleGroups service client. </summary>
-    public partial class FirewallPolicyRuleGroupsClient
+    public partial class FirewallPolicyRuleGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FirewallPolicyRuleGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsClient for mocking. </summary>
-        protected FirewallPolicyRuleGroupsClient()
+        internal FirewallPolicyRuleGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsOperations for mocking. </summary>
+        protected FirewallPolicyRuleGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FirewallPolicyRuleGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FirewallPolicyRuleGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FirewallPolicyRuleGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FirewallPolicyRuleGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal FirewallPolicyRuleGroupsClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FirewallPolicyRuleGroup>> GetAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FirewallPolicyRuleGroup>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FirewallPolicyRuleGroup> Get(string resourceGroupName, string firewallPolicyName, string ruleGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<FirewallPolicyRuleGroup> ListAsync(string resourceG
 
             async Task<Page<FirewallPolicyRuleGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<FirewallPolicyRuleGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FirewallPolicyRuleGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<FirewallPolicyRuleGroup> List(string resourceGroupName,
 
             Page<FirewallPolicyRuleGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<FirewallPolicyRuleGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<FirewallPolicyRuleGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<FirewallPolicyRuleGroupsDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(ruleGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual FirewallPolicyRuleGroupsDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(ruleGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<FirewallPolicyRuleGroupsCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual FirewallPolicyRuleGroupsCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsRestOperations.cs
index 5d018900f010c..efcbba3cdf43b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/FirewallPolicyRuleGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class FirewallPolicyRuleGroupsRestClient
+    internal partial class FirewallPolicyRuleGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FirewallPolicyRuleGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FirewallPolicyRuleGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsOperations.cs
index f460fcd2e02f6..8c4b76a5656c9 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The FlowLogs service client. </summary>
-    public partial class FlowLogsClient
+    public partial class FlowLogsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FlowLogsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FlowLogsClient for mocking. </summary>
-        protected FlowLogsClient()
+        internal FlowLogsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FlowLogsOperations for mocking. </summary>
+        protected FlowLogsOperations()
         {
         }
-        /// <summary> Initializes a new instance of FlowLogsClient. </summary>
+        /// <summary> Initializes a new instance of FlowLogsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FlowLogsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FlowLogsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FlowLogsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FlowLogsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal FlowLogsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FlowLog>> GetAsync(string resourceGroupName, string networkWatcherName, string flowLogName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FlowLog>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FlowLog> Get(string resourceGroupName, string networkWatcherName, string flowLogName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<FlowLog> ListAsync(string resourceGroupName, string
 
             async Task<Page<FlowLog>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<FlowLog>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FlowLog>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<FlowLog> List(string resourceGroupName, string networkWa
 
             Page<FlowLog> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<FlowLog> FirstPageFunc(int? pageSizeHint)
             }
             Page<FlowLog> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<FlowLogsCreateOrUpdateOperation> StartCreateOrUpdateAs
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual FlowLogsCreateOrUpdateOperation StartCreateOrUpdate(string resour
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<FlowLogsDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(flowLogName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual FlowLogsDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(flowLogName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsRestOperations.cs
index 17a71cacc9385..ae552cce6fca6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/FlowLogsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class FlowLogsRestClient
+    internal partial class FlowLogsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FlowLogsRestClient. </summary>
+        /// <summary> Initializes a new instance of FlowLogsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FlowLogsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FlowLogsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesOperations.cs
index fcbb100cc16fc..b81866f074ea4 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The HubRouteTables service client. </summary>
-    public partial class HubRouteTablesClient
+    public partial class HubRouteTablesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal HubRouteTablesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of HubRouteTablesClient for mocking. </summary>
-        protected HubRouteTablesClient()
+        internal HubRouteTablesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of HubRouteTablesOperations for mocking. </summary>
+        protected HubRouteTablesOperations()
         {
         }
-        /// <summary> Initializes a new instance of HubRouteTablesClient. </summary>
+        /// <summary> Initializes a new instance of HubRouteTablesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal HubRouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal HubRouteTablesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new HubRouteTablesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new HubRouteTablesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal HubRouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<HubRouteTable>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<HubRouteTable>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<HubRouteTable> Get(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<HubRouteTable> ListAsync(string resourceGroupName,
 
             async Task<Page<HubRouteTable>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<HubRouteTable>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<HubRouteTable>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<HubRouteTable> List(string resourceGroupName, string vir
 
             Page<HubRouteTable> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<HubRouteTable> FirstPageFunc(int? pageSizeHint)
             }
             Page<HubRouteTable> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<HubRouteTablesCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(routeTableParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual HubRouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(routeTableParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<HubRouteTablesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual HubRouteTablesDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesRestOperations.cs
index 62a7894e8de3e..9c233022fbaa1 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubRouteTablesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class HubRouteTablesRestClient
+    internal partial class HubRouteTablesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of HubRouteTablesRestClient. </summary>
+        /// <summary> Initializes a new instance of HubRouteTablesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public HubRouteTablesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public HubRouteTablesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsOperations.cs
similarity index 90%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsOperations.cs
index 149988a920b09..ea1f50b1c5b67 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The HubVirtualNetworkConnections service client. </summary>
-    public partial class HubVirtualNetworkConnectionsClient
+    public partial class HubVirtualNetworkConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal HubVirtualNetworkConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsClient for mocking. </summary>
-        protected HubVirtualNetworkConnectionsClient()
+        internal HubVirtualNetworkConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsOperations for mocking. </summary>
+        protected HubVirtualNetworkConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal HubVirtualNetworkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal HubVirtualNetworkConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new HubVirtualNetworkConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new HubVirtualNetworkConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal HubVirtualNetworkConnectionsClient(ClientDiagnostics clientDiagnostics,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<HubVirtualNetworkConnection>> GetAsync(string resourceGroupName, string virtualHubName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<HubVirtualNetworkConnection>> GetAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<HubVirtualNetworkConnection> Get(string resourceGroupName, string virtualHubName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<HubVirtualNetworkConnection> ListAsync(string resou
 
             async Task<Page<HubVirtualNetworkConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<HubVirtualNetworkConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<HubVirtualNetworkConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<HubVirtualNetworkConnection> List(string resourceGroupNa
 
             Page<HubVirtualNetworkConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<HubVirtualNetworkConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<HubVirtualNetworkConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsRestOperations.cs
index a465bcc16a934..555bb1789343c 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/HubVirtualNetworkConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class HubVirtualNetworkConnectionsRestClient
+    internal partial class HubVirtualNetworkConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public HubVirtualNetworkConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public HubVirtualNetworkConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesOperations.cs
index 77ecd1487dc3d..6655d6ade6838 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The InboundNatRules service client. </summary>
-    public partial class InboundNatRulesClient
+    public partial class InboundNatRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal InboundNatRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of InboundNatRulesClient for mocking. </summary>
-        protected InboundNatRulesClient()
+        internal InboundNatRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of InboundNatRulesOperations for mocking. </summary>
+        protected InboundNatRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of InboundNatRulesClient. </summary>
+        /// <summary> Initializes a new instance of InboundNatRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal InboundNatRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal InboundNatRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new InboundNatRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new InboundNatRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal InboundNatRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<InboundNatRule>> GetAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<InboundNatRule>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<InboundNatRule> Get(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<InboundNatRule> ListAsync(string resourceGroupName,
 
             async Task<Page<InboundNatRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<InboundNatRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<InboundNatRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ public virtual Pageable<InboundNatRule> List(string resourceGroupName, string lo
 
             Page<InboundNatRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -159,7 +159,7 @@ Page<InboundNatRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<InboundNatRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -195,7 +195,7 @@ public virtual async Task<InboundNatRulesDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(inboundNatRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual InboundNatRulesDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(inboundNatRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -268,7 +268,7 @@ public virtual async Task<InboundNatRulesCreateOrUpdateOperation> StartCreateOrU
                 throw new ArgumentNullException(nameof(inboundNatRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -307,7 +307,7 @@ public virtual InboundNatRulesCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(inboundNatRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesRestOperations.cs
index c39d721f3755f..8739bf3ca5349 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/InboundNatRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class InboundNatRulesRestClient
+    internal partial class InboundNatRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of InboundNatRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of InboundNatRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public InboundNatRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public InboundNatRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsOperations.cs
index 02e2ebe1b6618..71786f699b892 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The IpAllocations service client. </summary>
-    public partial class IpAllocationsClient
+    public partial class IpAllocationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal IpAllocationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of IpAllocationsClient for mocking. </summary>
-        protected IpAllocationsClient()
+        internal IpAllocationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of IpAllocationsOperations for mocking. </summary>
+        protected IpAllocationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of IpAllocationsClient. </summary>
+        /// <summary> Initializes a new instance of IpAllocationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal IpAllocationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal IpAllocationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new IpAllocationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new IpAllocationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal IpAllocationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpAllocation>> GetAsync(string resourceGroupName, string ipAllocationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<IpAllocation>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpAllocation> Get(string resourceGroupName, string ipAllocationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<IpAllocation> Get(string resourceGroupName, string ipAll
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpAllocation>> UpdateTagsAsync(string resourceGroupName, string ipAllocationName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<IpAllocation>> UpdateTagsAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpAllocation> UpdateTags(string resourceGroupName, string ipAllocationName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<IpAllocation> ListAsync(CancellationToken cancellat
         {
             async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpAllocation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<IpAllocation> List(CancellationToken cancellationToken =
         {
             Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpAllocation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<IpAllocation> ListByResourceGroupAsync(string resou
 
             async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpAllocation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<IpAllocation> ListByResourceGroup(string resourceGroupNa
 
             Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpAllocation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<IpAllocationsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(ipAllocationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual IpAllocationsDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(ipAllocationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<IpAllocationsCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual IpAllocationsCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsRestOperations.cs
index ee07c961d5a9e..45997158bf012 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpAllocationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class IpAllocationsRestClient
+    internal partial class IpAllocationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of IpAllocationsRestClient. </summary>
+        /// <summary> Initializes a new instance of IpAllocationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public IpAllocationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public IpAllocationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsOperations.cs
index 07accb017e2f8..495f49324c9c9 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The IpGroups service client. </summary>
-    public partial class IpGroupsClient
+    public partial class IpGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal IpGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of IpGroupsClient for mocking. </summary>
-        protected IpGroupsClient()
+        internal IpGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of IpGroupsOperations for mocking. </summary>
+        protected IpGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of IpGroupsClient. </summary>
+        /// <summary> Initializes a new instance of IpGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal IpGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal IpGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new IpGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new IpGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal IpGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpGroup>> GetAsync(string resourceGroupName, string ipGroupsName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<IpGroup>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpGroup> Get(string resourceGroupName, string ipGroupsName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<IpGroup> Get(string resourceGroupName, string ipGroupsNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpGroup>> UpdateGroupsAsync(string resourceGroupName, string ipGroupsName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.UpdateGroups");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.UpdateGroups");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<IpGroup>> UpdateGroupsAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpGroup> UpdateGroups(string resourceGroupName, string ipGroupsName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.UpdateGroups");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.UpdateGroups");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<IpGroup> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<IpGroup> ListByResourceGroup(string resourceGroupName, C
 
             Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<IpGroup> ListAsync(CancellationToken cancellationTo
         {
             async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<IpGroup> List(CancellationToken cancellationToken = defa
         {
             Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -297,7 +297,7 @@ public virtual async Task<IpGroupsCreateOrUpdateOperation> StartCreateOrUpdateAs
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -331,7 +331,7 @@ public virtual IpGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resour
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -360,7 +360,7 @@ public virtual async Task<IpGroupsDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(ipGroupsName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual IpGroupsDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(ipGroupsName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsRestOperations.cs
index e488d32726a47..352dc626b7350 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/IpGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class IpGroupsRestClient
+    internal partial class IpGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of IpGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of IpGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public IpGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public IpGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsOperations.cs
index 6a5c8b7ae0730..5987a595dc67d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancerBackendAddressPools service client. </summary>
-    public partial class LoadBalancerBackendAddressPoolsClient
+    public partial class LoadBalancerBackendAddressPoolsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerBackendAddressPoolsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsClient for mocking. </summary>
-        protected LoadBalancerBackendAddressPoolsClient()
+        internal LoadBalancerBackendAddressPoolsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsOperations for mocking. </summary>
+        protected LoadBalancerBackendAddressPoolsOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerBackendAddressPoolsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerBackendAddressPoolsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerBackendAddressPoolsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerBackendAddressPoolsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerBackendAddressPoolsClient(ClientDiagnostics clientDiagnosti
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BackendAddressPool>> GetAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<BackendAddressPool>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BackendAddressPool> Get(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<BackendAddressPool> ListAsync(string resourceGroupN
 
             async Task<Page<BackendAddressPool>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<BackendAddressPool>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BackendAddressPool>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<BackendAddressPool> List(string resourceGroupName, strin
 
             Page<BackendAddressPool> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<BackendAddressPool> FirstPageFunc(int? pageSizeHint)
             }
             Page<BackendAddressPool> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<LoadBalancerBackendAddressPoolsCreateOrUpdateOperation
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual LoadBalancerBackendAddressPoolsCreateOrUpdateOperation StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<LoadBalancerBackendAddressPoolsDeleteOperation> StartD
                 throw new ArgumentNullException(nameof(backendAddressPoolName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual LoadBalancerBackendAddressPoolsDeleteOperation StartDelete(string
                 throw new ArgumentNullException(nameof(backendAddressPoolName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsRestOperations.cs
index 999b17e467d96..c6c0855da2925 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerBackendAddressPoolsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancerBackendAddressPoolsRestClient
+    internal partial class LoadBalancerBackendAddressPoolsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerBackendAddressPoolsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerBackendAddressPoolsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsOperations.cs
similarity index 89%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsOperations.cs
index 1fb867c172522..9fb073e491a4d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancerFrontendIPConfigurations service client. </summary>
-    public partial class LoadBalancerFrontendIPConfigurationsClient
+    public partial class LoadBalancerFrontendIPConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerFrontendIPConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsClient for mocking. </summary>
-        protected LoadBalancerFrontendIPConfigurationsClient()
+        internal LoadBalancerFrontendIPConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsOperations for mocking. </summary>
+        protected LoadBalancerFrontendIPConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerFrontendIPConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerFrontendIPConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerFrontendIPConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerFrontendIPConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerFrontendIPConfigurationsClient(ClientDiagnostics clientDiag
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FrontendIPConfiguration>> GetAsync(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FrontendIPConfiguration>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FrontendIPConfiguration> Get(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<FrontendIPConfiguration> ListAsync(string resourceG
 
             async Task<Page<FrontendIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<FrontendIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FrontendIPConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<FrontendIPConfiguration> List(string resourceGroupName,
 
             Page<FrontendIPConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<FrontendIPConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<FrontendIPConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsRestOperations.cs
index 52257e581be23..4d23c94115e63 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerFrontendIPConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancerFrontendIPConfigurationsRestClient
+    internal partial class LoadBalancerFrontendIPConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerFrontendIPConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerFrontendIPConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesOperations.cs
similarity index 89%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesOperations.cs
index 0b1fe666a40a0..5653dcb463ec2 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancerLoadBalancingRules service client. </summary>
-    public partial class LoadBalancerLoadBalancingRulesClient
+    public partial class LoadBalancerLoadBalancingRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerLoadBalancingRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesClient for mocking. </summary>
-        protected LoadBalancerLoadBalancingRulesClient()
+        internal LoadBalancerLoadBalancingRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesOperations for mocking. </summary>
+        protected LoadBalancerLoadBalancingRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerLoadBalancingRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerLoadBalancingRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerLoadBalancingRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerLoadBalancingRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerLoadBalancingRulesClient(ClientDiagnostics clientDiagnostic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LoadBalancingRule>> GetAsync(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<LoadBalancingRule>> GetAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LoadBalancingRule> Get(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<LoadBalancingRule> ListAsync(string resourceGroupNa
 
             async Task<Page<LoadBalancingRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<LoadBalancingRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancingRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<LoadBalancingRule> List(string resourceGroupName, string
 
             Page<LoadBalancingRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<LoadBalancingRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancingRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesRestOperations.cs
index 2f68da15b8052..f39db7d1868ff 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerLoadBalancingRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancerLoadBalancingRulesRestClient
+    internal partial class LoadBalancerLoadBalancingRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerLoadBalancingRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerLoadBalancingRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesOperations.cs
similarity index 87%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesOperations.cs
index 7f973ac0c5601..cda06540df440 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancerNetworkInterfaces service client. </summary>
-    public partial class LoadBalancerNetworkInterfacesClient
+    public partial class LoadBalancerNetworkInterfacesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerNetworkInterfacesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesClient for mocking. </summary>
-        protected LoadBalancerNetworkInterfacesClient()
+        internal LoadBalancerNetworkInterfacesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesOperations for mocking. </summary>
+        protected LoadBalancerNetworkInterfacesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerNetworkInterfacesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerNetworkInterfacesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerNetworkInterfacesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerNetworkInterfacesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -54,7 +54,7 @@ public virtual AsyncPageable<NetworkInterface> ListAsync(string resourceGroupNam
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -69,7 +69,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ public virtual Pageable<NetworkInterface> List(string resourceGroupName, string
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -117,7 +117,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesRestOperations.cs
index 2f98739a2b626..be2d8ca09b529 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerNetworkInterfacesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancerNetworkInterfacesRestClient
+    internal partial class LoadBalancerNetworkInterfacesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerNetworkInterfacesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerNetworkInterfacesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesOperations.cs
similarity index 90%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesOperations.cs
index 8b708315440e6..0a4cad6b41f63 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancerOutboundRules service client. </summary>
-    public partial class LoadBalancerOutboundRulesClient
+    public partial class LoadBalancerOutboundRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerOutboundRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesClient for mocking. </summary>
-        protected LoadBalancerOutboundRulesClient()
+        internal LoadBalancerOutboundRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesOperations for mocking. </summary>
+        protected LoadBalancerOutboundRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerOutboundRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerOutboundRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerOutboundRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerOutboundRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerOutboundRulesClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<OutboundRule>> GetAsync(string resourceGroupName, string loadBalancerName, string outboundRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<OutboundRule>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<OutboundRule> Get(string resourceGroupName, string loadBalancerName, string outboundRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<OutboundRule> ListAsync(string resourceGroupName, s
 
             async Task<Page<OutboundRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<OutboundRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OutboundRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<OutboundRule> List(string resourceGroupName, string load
 
             Page<OutboundRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<OutboundRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<OutboundRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesRestOperations.cs
index 5693ebcab7f40..e1f53e98dc252 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerOutboundRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancerOutboundRulesRestClient
+    internal partial class LoadBalancerOutboundRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerOutboundRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerOutboundRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesOperations.cs
similarity index 91%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesOperations.cs
index 538fb513692eb..38678c0fb49f6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancerProbes service client. </summary>
-    public partial class LoadBalancerProbesClient
+    public partial class LoadBalancerProbesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerProbesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerProbesClient for mocking. </summary>
-        protected LoadBalancerProbesClient()
+        internal LoadBalancerProbesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerProbesOperations for mocking. </summary>
+        protected LoadBalancerProbesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerProbesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerProbesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerProbesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerProbesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerProbesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerProbesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerProbesClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Probe>> GetAsync(string resourceGroupName, string loadBalancerName, string probeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<Probe>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Probe> Get(string resourceGroupName, string loadBalancerName, string probeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<Probe> ListAsync(string resourceGroupName, string l
 
             async Task<Page<Probe>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<Probe>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Probe>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<Probe> List(string resourceGroupName, string loadBalance
 
             Page<Probe> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<Probe> FirstPageFunc(int? pageSizeHint)
             }
             Page<Probe> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesRestOperations.cs
index 27972c28821e8..4ec324475246e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancerProbesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancerProbesRestClient
+    internal partial class LoadBalancerProbesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerProbesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerProbesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerProbesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerProbesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersOperations.cs
index cf34d44b77e0a..857c7f30d4770 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LoadBalancers service client. </summary>
-    public partial class LoadBalancersClient
+    public partial class LoadBalancersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancersClient for mocking. </summary>
-        protected LoadBalancersClient()
+        internal LoadBalancersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancersOperations for mocking. </summary>
+        protected LoadBalancersOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancersClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancersClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LoadBalancer>> GetAsync(string resourceGroupName, string loadBalancerName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<LoadBalancer>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LoadBalancer> Get(string resourceGroupName, string loadBalancerName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<LoadBalancer> Get(string resourceGroupName, string loadB
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LoadBalancer>> UpdateTagsAsync(string resourceGroupName, string loadBalancerName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<LoadBalancer>> UpdateTagsAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LoadBalancer> UpdateTags(string resourceGroupName, string loadBalancerName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<LoadBalancer> ListAllAsync(CancellationToken cancel
         {
             async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancer>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<LoadBalancer> ListAll(CancellationToken cancellationToke
         {
             Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancer> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<LoadBalancer> ListAsync(string resourceGroupName, C
 
             async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancer>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<LoadBalancer> List(string resourceGroupName, Cancellatio
 
             Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancer> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<LoadBalancersDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(loadBalancerName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual LoadBalancersDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(loadBalancerName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<LoadBalancersCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual LoadBalancersCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersRestOperations.cs
index 42217178d6d3e..c0a20fbaa5aef 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LoadBalancersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LoadBalancersRestClient
+    internal partial class LoadBalancersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancersRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysOperations.cs
index b3dae0612ece7..d5cfe037fca11 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The LocalNetworkGateways service client. </summary>
-    public partial class LocalNetworkGatewaysClient
+    public partial class LocalNetworkGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LocalNetworkGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LocalNetworkGatewaysClient for mocking. </summary>
-        protected LocalNetworkGatewaysClient()
+        internal LocalNetworkGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LocalNetworkGatewaysOperations for mocking. </summary>
+        protected LocalNetworkGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of LocalNetworkGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of LocalNetworkGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LocalNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LocalNetworkGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LocalNetworkGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LocalNetworkGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal LocalNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LocalNetworkGateway>> GetAsync(string resourceGroupName, string localNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<LocalNetworkGateway>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LocalNetworkGateway> Get(string resourceGroupName, string localNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<LocalNetworkGateway> Get(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LocalNetworkGateway>> UpdateTagsAsync(string resourceGroupName, string localNetworkGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<LocalNetworkGateway>> UpdateTagsAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LocalNetworkGateway> UpdateTags(string resourceGroupName, string localNetworkGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<LocalNetworkGateway> ListAsync(string resourceGroup
 
             async Task<Page<LocalNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<LocalNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LocalNetworkGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<LocalNetworkGateway> List(string resourceGroupName, Canc
 
             Page<LocalNetworkGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<LocalNetworkGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<LocalNetworkGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ public virtual async Task<LocalNetworkGatewaysCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -255,7 +255,7 @@ public virtual LocalNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -284,7 +284,7 @@ public virtual async Task<LocalNetworkGatewaysDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(localNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -313,7 +313,7 @@ public virtual LocalNetworkGatewaysDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(localNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysRestOperations.cs
index da6856adc0893..89a11fdaba5a7 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/LocalNetworkGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class LocalNetworkGatewaysRestClient
+    internal partial class LocalNetworkGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LocalNetworkGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of LocalNetworkGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LocalNetworkGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LocalNetworkGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysOperations.cs
index 85a71b3b5e995..4cc5f024752b8 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NatGateways service client. </summary>
-    public partial class NatGatewaysClient
+    public partial class NatGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NatGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NatGatewaysClient for mocking. </summary>
-        protected NatGatewaysClient()
+        internal NatGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NatGatewaysOperations for mocking. </summary>
+        protected NatGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of NatGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of NatGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NatGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NatGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NatGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NatGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NatGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NatGateway>> GetAsync(string resourceGroupName, string natGatewayName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NatGateway>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NatGateway> Get(string resourceGroupName, string natGatewayName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NatGateway> Get(string resourceGroupName, string natGate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NatGateway>> UpdateTagsAsync(string resourceGroupName, string natGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NatGateway>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NatGateway> UpdateTags(string resourceGroupName, string natGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<NatGateway> ListAllAsync(CancellationToken cancella
         {
             async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NatGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<NatGateway> ListAll(CancellationToken cancellationToken
         {
             Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<NatGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<NatGateway> ListAsync(string resourceGroupName, Can
 
             async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NatGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<NatGateway> List(string resourceGroupName, CancellationT
 
             Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<NatGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<NatGatewaysDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(natGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual NatGatewaysDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(natGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<NatGatewaysCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual NatGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysRestOperations.cs
index 08d69b77b4913..67e9e0bc42dd0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NatGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NatGatewaysRestClient
+    internal partial class NatGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NatGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of NatGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NatGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NatGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsOperations.cs
similarity index 90%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsOperations.cs
index 618c1622c73e7..7885b300a0f07 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkInterfaceIPConfigurations service client. </summary>
-    public partial class NetworkInterfaceIPConfigurationsClient
+    public partial class NetworkInterfaceIPConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfaceIPConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsClient for mocking. </summary>
-        protected NetworkInterfaceIPConfigurationsClient()
+        internal NetworkInterfaceIPConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsOperations for mocking. </summary>
+        protected NetworkInterfaceIPConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfaceIPConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfaceIPConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfaceIPConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfaceIPConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkInterfaceIPConfigurationsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterfaceIPConfiguration> Get(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<NetworkInterfaceIPConfiguration> ListAsync(string r
 
             async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<NetworkInterfaceIPConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<NetworkInterfaceIPConfiguration> List(string resourceGro
 
             Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterfaceIPConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsRestOperations.cs
index 81183c0825554..4c000d36eb988 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceIPConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkInterfaceIPConfigurationsRestClient
+    internal partial class NetworkInterfaceIPConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfaceIPConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfaceIPConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersOperations.cs
similarity index 87%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersOperations.cs
index 956bdbd9dfb4a..4467ff6e4c4f5 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkInterfaceLoadBalancers service client. </summary>
-    public partial class NetworkInterfaceLoadBalancersClient
+    public partial class NetworkInterfaceLoadBalancersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfaceLoadBalancersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersClient for mocking. </summary>
-        protected NetworkInterfaceLoadBalancersClient()
+        internal NetworkInterfaceLoadBalancersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersOperations for mocking. </summary>
+        protected NetworkInterfaceLoadBalancersOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfaceLoadBalancersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfaceLoadBalancersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfaceLoadBalancersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfaceLoadBalancersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -54,7 +54,7 @@ public virtual AsyncPageable<LoadBalancer> ListAsync(string resourceGroupName, s
 
             async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -69,7 +69,7 @@ async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancer>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ public virtual Pageable<LoadBalancer> List(string resourceGroupName, string netw
 
             Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -117,7 +117,7 @@ Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancer> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersRestOperations.cs
index 63103ab0fa897..aba8950f9c926 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceLoadBalancersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkInterfaceLoadBalancersRestClient
+    internal partial class NetworkInterfaceLoadBalancersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfaceLoadBalancersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfaceLoadBalancersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsOperations.cs
index a6e556cf04556..6856807fe534d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkInterfaceTapConfigurations service client. </summary>
-    public partial class NetworkInterfaceTapConfigurationsClient
+    public partial class NetworkInterfaceTapConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfaceTapConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsClient for mocking. </summary>
-        protected NetworkInterfaceTapConfigurationsClient()
+        internal NetworkInterfaceTapConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsOperations for mocking. </summary>
+        protected NetworkInterfaceTapConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfaceTapConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfaceTapConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfaceTapConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfaceTapConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkInterfaceTapConfigurationsClient(ClientDiagnostics clientDiagnos
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterfaceTapConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkInterfaceTapConfiguration>> GetAsync(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterfaceTapConfiguration> Get(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<NetworkInterfaceTapConfiguration> ListAsync(string
 
             async Task<Page<NetworkInterfaceTapConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<NetworkInterfaceTapConfiguration>> FirstPageFunc(int? pageSizeHi
             }
             async Task<Page<NetworkInterfaceTapConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<NetworkInterfaceTapConfiguration> List(string resourceGr
 
             Page<NetworkInterfaceTapConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<NetworkInterfaceTapConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterfaceTapConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<NetworkInterfaceTapConfigurationsDeleteOperation> Star
                 throw new ArgumentNullException(nameof(tapConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual NetworkInterfaceTapConfigurationsDeleteOperation StartDelete(stri
                 throw new ArgumentNullException(nameof(tapConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<NetworkInterfaceTapConfigurationsCreateOrUpdateOperati
                 throw new ArgumentNullException(nameof(tapConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual NetworkInterfaceTapConfigurationsCreateOrUpdateOperation StartCre
                 throw new ArgumentNullException(nameof(tapConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsRestOperations.cs
index cc3ad7ede42d8..487a643890dfd 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfaceTapConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkInterfaceTapConfigurationsRestClient
+    internal partial class NetworkInterfaceTapConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfaceTapConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfaceTapConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesOperations.cs
index 8c8a795c03497..061568b2ad65b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkInterfaces service client. </summary>
-    public partial class NetworkInterfacesClient
+    public partial class NetworkInterfacesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfacesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfacesClient for mocking. </summary>
-        protected NetworkInterfacesClient()
+        internal NetworkInterfacesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfacesOperations for mocking. </summary>
+        protected NetworkInterfacesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfacesClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfacesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfacesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfacesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfacesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfacesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkInterfacesClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterface>> GetAsync(string resourceGroupName, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkInterface>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterface> Get(string resourceGroupName, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkInterface> Get(string resourceGroupName, string n
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterface>> UpdateTagsAsync(string resourceGroupName, string networkInterfaceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkInterface>> UpdateTagsAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterface> UpdateTags(string resourceGroupName, string networkInterfaceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -126,7 +126,7 @@ public virtual Response<NetworkInterface> UpdateTags(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterface>> GetVirtualMachineScaleSetNetworkInterfaceAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetNetworkInterface");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetNetworkInterface");
             scope.Start();
             try
             {
@@ -148,7 +148,7 @@ public virtual async Task<Response<NetworkInterface>> GetVirtualMachineScaleSetN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterface> GetVirtualMachineScaleSetNetworkInterface(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetNetworkInterface");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetNetworkInterface");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual Response<NetworkInterface> GetVirtualMachineScaleSetNetworkInterf
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetVirtualMachineScaleSetIpConfigurationAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetIpConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetIpConfiguration");
             scope.Start();
             try
             {
@@ -194,7 +194,7 @@ public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetVirtualM
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterfaceIPConfiguration> GetVirtualMachineScaleSetIpConfiguration(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetIpConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetIpConfiguration");
             scope.Start();
             try
             {
@@ -213,7 +213,7 @@ public virtual AsyncPageable<NetworkInterface> ListAllAsync(CancellationToken ca
         {
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -228,7 +228,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -250,7 +250,7 @@ public virtual Pageable<NetworkInterface> ListAll(CancellationToken cancellation
         {
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -265,7 +265,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -293,7 +293,7 @@ public virtual AsyncPageable<NetworkInterface> ListAsync(string resourceGroupNam
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -308,7 +308,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -336,7 +336,7 @@ public virtual Pageable<NetworkInterface> List(string resourceGroupName, Cancell
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -351,7 +351,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -389,7 +389,7 @@ public virtual AsyncPageable<NetworkInterface> ListVirtualMachineScaleSetVMNetwo
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -404,7 +404,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -442,7 +442,7 @@ public virtual Pageable<NetworkInterface> ListVirtualMachineScaleSetVMNetworkInt
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -457,7 +457,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -490,7 +490,7 @@ public virtual AsyncPageable<NetworkInterface> ListVirtualMachineScaleSetNetwork
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -505,7 +505,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -538,7 +538,7 @@ public virtual Pageable<NetworkInterface> ListVirtualMachineScaleSetNetworkInter
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -553,7 +553,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -597,7 +597,7 @@ public virtual AsyncPageable<NetworkInterfaceIPConfiguration> ListVirtualMachine
 
             async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -612,7 +612,7 @@ async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<NetworkInterfaceIPConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -656,7 +656,7 @@ public virtual Pageable<NetworkInterfaceIPConfiguration> ListVirtualMachineScale
 
             Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -671,7 +671,7 @@ Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterfaceIPConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -702,7 +702,7 @@ public virtual async Task<NetworkInterfacesDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -731,7 +731,7 @@ public virtual NetworkInterfacesDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -765,7 +765,7 @@ public virtual async Task<NetworkInterfacesCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -799,7 +799,7 @@ public virtual NetworkInterfacesCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -828,7 +828,7 @@ public virtual async Task<NetworkInterfacesGetEffectiveRouteTableOperation> Star
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartGetEffectiveRouteTable");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartGetEffectiveRouteTable");
             scope.Start();
             try
             {
@@ -857,7 +857,7 @@ public virtual NetworkInterfacesGetEffectiveRouteTableOperation StartGetEffectiv
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartGetEffectiveRouteTable");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartGetEffectiveRouteTable");
             scope.Start();
             try
             {
@@ -886,7 +886,7 @@ public virtual async Task<NetworkInterfacesListEffectiveNetworkSecurityGroupsOpe
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartListEffectiveNetworkSecurityGroups");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartListEffectiveNetworkSecurityGroups");
             scope.Start();
             try
             {
@@ -915,7 +915,7 @@ public virtual NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation Star
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartListEffectiveNetworkSecurityGroups");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartListEffectiveNetworkSecurityGroups");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesRestOperations.cs
index c118a547a28d3..c1e0eb408ead4 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkInterfacesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkInterfacesRestClient
+    internal partial class NetworkInterfacesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfacesRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfacesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfacesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfacesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkManagementClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkManagementClient.cs
index 911aeb056ec9e..69af82afc89c4 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkManagementClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkManagementClient.cs
@@ -53,574 +53,289 @@ public NetworkManagementClient(string subscriptionId, Uri endpoint, TokenCredent
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of ApplicationGatewaysClient. </summary>
-        public virtual ApplicationGatewaysClient GetApplicationGatewaysClient()
-        {
-            return new ApplicationGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationGatewaysOperations. </summary>
+        public virtual ApplicationGatewaysOperations ApplicationGateways => new ApplicationGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ApplicationSecurityGroupsClient. </summary>
-        public virtual ApplicationSecurityGroupsClient GetApplicationSecurityGroupsClient()
-        {
-            return new ApplicationSecurityGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationSecurityGroupsOperations. </summary>
+        public virtual ApplicationSecurityGroupsOperations ApplicationSecurityGroups => new ApplicationSecurityGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableDelegationsClient. </summary>
-        public virtual AvailableDelegationsClient GetAvailableDelegationsClient()
-        {
-            return new AvailableDelegationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableDelegationsOperations. </summary>
+        public virtual AvailableDelegationsOperations AvailableDelegations => new AvailableDelegationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableResourceGroupDelegationsClient. </summary>
-        public virtual AvailableResourceGroupDelegationsClient GetAvailableResourceGroupDelegationsClient()
-        {
-            return new AvailableResourceGroupDelegationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableResourceGroupDelegationsOperations. </summary>
+        public virtual AvailableResourceGroupDelegationsOperations AvailableResourceGroupDelegations => new AvailableResourceGroupDelegationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableServiceAliasesClient. </summary>
-        public virtual AvailableServiceAliasesClient GetAvailableServiceAliasesClient()
-        {
-            return new AvailableServiceAliasesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableServiceAliasesOperations. </summary>
+        public virtual AvailableServiceAliasesOperations AvailableServiceAliases => new AvailableServiceAliasesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AzureFirewallsClient. </summary>
-        public virtual AzureFirewallsClient GetAzureFirewallsClient()
-        {
-            return new AzureFirewallsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AzureFirewallsOperations. </summary>
+        public virtual AzureFirewallsOperations AzureFirewalls => new AzureFirewallsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AzureFirewallFqdnTagsClient. </summary>
-        public virtual AzureFirewallFqdnTagsClient GetAzureFirewallFqdnTagsClient()
-        {
-            return new AzureFirewallFqdnTagsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AzureFirewallFqdnTagsOperations. </summary>
+        public virtual AzureFirewallFqdnTagsOperations AzureFirewallFqdnTags => new AzureFirewallFqdnTagsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BastionHostsClient. </summary>
-        public virtual BastionHostsClient GetBastionHostsClient()
-        {
-            return new BastionHostsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BastionHostsOperations. </summary>
+        public virtual BastionHostsOperations BastionHosts => new BastionHostsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceClient. </summary>
-        public virtual ServiceClient GetServiceClient()
-        {
-            return new ServiceClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceOperations. </summary>
+        public virtual ServiceOperations Service => new ServiceOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DdosCustomPoliciesClient. </summary>
-        public virtual DdosCustomPoliciesClient GetDdosCustomPoliciesClient()
-        {
-            return new DdosCustomPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DdosCustomPoliciesOperations. </summary>
+        public virtual DdosCustomPoliciesOperations DdosCustomPolicies => new DdosCustomPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DdosProtectionPlansClient. </summary>
-        public virtual DdosProtectionPlansClient GetDdosProtectionPlansClient()
-        {
-            return new DdosProtectionPlansClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DdosProtectionPlansOperations. </summary>
+        public virtual DdosProtectionPlansOperations DdosProtectionPlans => new DdosProtectionPlansOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableEndpointServicesClient. </summary>
-        public virtual AvailableEndpointServicesClient GetAvailableEndpointServicesClient()
-        {
-            return new AvailableEndpointServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableEndpointServicesOperations. </summary>
+        public virtual AvailableEndpointServicesOperations AvailableEndpointServices => new AvailableEndpointServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitAuthorizationsClient. </summary>
-        public virtual ExpressRouteCircuitAuthorizationsClient GetExpressRouteCircuitAuthorizationsClient()
-        {
-            return new ExpressRouteCircuitAuthorizationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitAuthorizationsOperations. </summary>
+        public virtual ExpressRouteCircuitAuthorizationsOperations ExpressRouteCircuitAuthorizations => new ExpressRouteCircuitAuthorizationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitPeeringsClient. </summary>
-        public virtual ExpressRouteCircuitPeeringsClient GetExpressRouteCircuitPeeringsClient()
-        {
-            return new ExpressRouteCircuitPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitPeeringsOperations. </summary>
+        public virtual ExpressRouteCircuitPeeringsOperations ExpressRouteCircuitPeerings => new ExpressRouteCircuitPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitConnectionsClient. </summary>
-        public virtual ExpressRouteCircuitConnectionsClient GetExpressRouteCircuitConnectionsClient()
-        {
-            return new ExpressRouteCircuitConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitConnectionsOperations. </summary>
+        public virtual ExpressRouteCircuitConnectionsOperations ExpressRouteCircuitConnections => new ExpressRouteCircuitConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PeerExpressRouteCircuitConnectionsClient. </summary>
-        public virtual PeerExpressRouteCircuitConnectionsClient GetPeerExpressRouteCircuitConnectionsClient()
-        {
-            return new PeerExpressRouteCircuitConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PeerExpressRouteCircuitConnectionsOperations. </summary>
+        public virtual PeerExpressRouteCircuitConnectionsOperations PeerExpressRouteCircuitConnections => new PeerExpressRouteCircuitConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitsClient. </summary>
-        public virtual ExpressRouteCircuitsClient GetExpressRouteCircuitsClient()
-        {
-            return new ExpressRouteCircuitsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitsOperations. </summary>
+        public virtual ExpressRouteCircuitsOperations ExpressRouteCircuits => new ExpressRouteCircuitsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteServiceProvidersClient. </summary>
-        public virtual ExpressRouteServiceProvidersClient GetExpressRouteServiceProvidersClient()
-        {
-            return new ExpressRouteServiceProvidersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteServiceProvidersOperations. </summary>
+        public virtual ExpressRouteServiceProvidersOperations ExpressRouteServiceProviders => new ExpressRouteServiceProvidersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCrossConnectionsClient. </summary>
-        public virtual ExpressRouteCrossConnectionsClient GetExpressRouteCrossConnectionsClient()
-        {
-            return new ExpressRouteCrossConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCrossConnectionsOperations. </summary>
+        public virtual ExpressRouteCrossConnectionsOperations ExpressRouteCrossConnections => new ExpressRouteCrossConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCrossConnectionPeeringsClient. </summary>
-        public virtual ExpressRouteCrossConnectionPeeringsClient GetExpressRouteCrossConnectionPeeringsClient()
-        {
-            return new ExpressRouteCrossConnectionPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCrossConnectionPeeringsOperations. </summary>
+        public virtual ExpressRouteCrossConnectionPeeringsOperations ExpressRouteCrossConnectionPeerings => new ExpressRouteCrossConnectionPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRoutePortsLocationsClient. </summary>
-        public virtual ExpressRoutePortsLocationsClient GetExpressRoutePortsLocationsClient()
-        {
-            return new ExpressRoutePortsLocationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRoutePortsLocationsOperations. </summary>
+        public virtual ExpressRoutePortsLocationsOperations ExpressRoutePortsLocations => new ExpressRoutePortsLocationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRoutePortsClient. </summary>
-        public virtual ExpressRoutePortsClient GetExpressRoutePortsClient()
-        {
-            return new ExpressRoutePortsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRoutePortsOperations. </summary>
+        public virtual ExpressRoutePortsOperations ExpressRoutePorts => new ExpressRoutePortsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteLinksClient. </summary>
-        public virtual ExpressRouteLinksClient GetExpressRouteLinksClient()
-        {
-            return new ExpressRouteLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteLinksOperations. </summary>
+        public virtual ExpressRouteLinksOperations ExpressRouteLinks => new ExpressRouteLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FirewallPoliciesClient. </summary>
-        public virtual FirewallPoliciesClient GetFirewallPoliciesClient()
-        {
-            return new FirewallPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FirewallPoliciesOperations. </summary>
+        public virtual FirewallPoliciesOperations FirewallPolicies => new FirewallPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FirewallPolicyRuleGroupsClient. </summary>
-        public virtual FirewallPolicyRuleGroupsClient GetFirewallPolicyRuleGroupsClient()
-        {
-            return new FirewallPolicyRuleGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FirewallPolicyRuleGroupsOperations. </summary>
+        public virtual FirewallPolicyRuleGroupsOperations FirewallPolicyRuleGroups => new FirewallPolicyRuleGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of IpAllocationsClient. </summary>
-        public virtual IpAllocationsClient GetIpAllocationsClient()
-        {
-            return new IpAllocationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of IpAllocationsOperations. </summary>
+        public virtual IpAllocationsOperations IpAllocations => new IpAllocationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of IpGroupsClient. </summary>
-        public virtual IpGroupsClient GetIpGroupsClient()
-        {
-            return new IpGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of IpGroupsOperations. </summary>
+        public virtual IpGroupsOperations IpGroups => new IpGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancersClient. </summary>
-        public virtual LoadBalancersClient GetLoadBalancersClient()
-        {
-            return new LoadBalancersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancersOperations. </summary>
+        public virtual LoadBalancersOperations LoadBalancers => new LoadBalancersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerBackendAddressPoolsClient. </summary>
-        public virtual LoadBalancerBackendAddressPoolsClient GetLoadBalancerBackendAddressPoolsClient()
-        {
-            return new LoadBalancerBackendAddressPoolsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerBackendAddressPoolsOperations. </summary>
+        public virtual LoadBalancerBackendAddressPoolsOperations LoadBalancerBackendAddressPools => new LoadBalancerBackendAddressPoolsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerFrontendIPConfigurationsClient. </summary>
-        public virtual LoadBalancerFrontendIPConfigurationsClient GetLoadBalancerFrontendIPConfigurationsClient()
-        {
-            return new LoadBalancerFrontendIPConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerFrontendIPConfigurationsOperations. </summary>
+        public virtual LoadBalancerFrontendIPConfigurationsOperations LoadBalancerFrontendIPConfigurations => new LoadBalancerFrontendIPConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of InboundNatRulesClient. </summary>
-        public virtual InboundNatRulesClient GetInboundNatRulesClient()
-        {
-            return new InboundNatRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of InboundNatRulesOperations. </summary>
+        public virtual InboundNatRulesOperations InboundNatRules => new InboundNatRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerLoadBalancingRulesClient. </summary>
-        public virtual LoadBalancerLoadBalancingRulesClient GetLoadBalancerLoadBalancingRulesClient()
-        {
-            return new LoadBalancerLoadBalancingRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerLoadBalancingRulesOperations. </summary>
+        public virtual LoadBalancerLoadBalancingRulesOperations LoadBalancerLoadBalancingRules => new LoadBalancerLoadBalancingRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerOutboundRulesClient. </summary>
-        public virtual LoadBalancerOutboundRulesClient GetLoadBalancerOutboundRulesClient()
-        {
-            return new LoadBalancerOutboundRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerOutboundRulesOperations. </summary>
+        public virtual LoadBalancerOutboundRulesOperations LoadBalancerOutboundRules => new LoadBalancerOutboundRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerNetworkInterfacesClient. </summary>
-        public virtual LoadBalancerNetworkInterfacesClient GetLoadBalancerNetworkInterfacesClient()
-        {
-            return new LoadBalancerNetworkInterfacesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerNetworkInterfacesOperations. </summary>
+        public virtual LoadBalancerNetworkInterfacesOperations LoadBalancerNetworkInterfaces => new LoadBalancerNetworkInterfacesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerProbesClient. </summary>
-        public virtual LoadBalancerProbesClient GetLoadBalancerProbesClient()
-        {
-            return new LoadBalancerProbesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerProbesOperations. </summary>
+        public virtual LoadBalancerProbesOperations LoadBalancerProbes => new LoadBalancerProbesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NatGatewaysClient. </summary>
-        public virtual NatGatewaysClient GetNatGatewaysClient()
-        {
-            return new NatGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NatGatewaysOperations. </summary>
+        public virtual NatGatewaysOperations NatGateways => new NatGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfacesClient. </summary>
-        public virtual NetworkInterfacesClient GetNetworkInterfacesClient()
-        {
-            return new NetworkInterfacesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfacesOperations. </summary>
+        public virtual NetworkInterfacesOperations NetworkInterfaces => new NetworkInterfacesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfaceIPConfigurationsClient. </summary>
-        public virtual NetworkInterfaceIPConfigurationsClient GetNetworkInterfaceIPConfigurationsClient()
-        {
-            return new NetworkInterfaceIPConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfaceIPConfigurationsOperations. </summary>
+        public virtual NetworkInterfaceIPConfigurationsOperations NetworkInterfaceIPConfigurations => new NetworkInterfaceIPConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfaceLoadBalancersClient. </summary>
-        public virtual NetworkInterfaceLoadBalancersClient GetNetworkInterfaceLoadBalancersClient()
-        {
-            return new NetworkInterfaceLoadBalancersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfaceLoadBalancersOperations. </summary>
+        public virtual NetworkInterfaceLoadBalancersOperations NetworkInterfaceLoadBalancers => new NetworkInterfaceLoadBalancersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfaceTapConfigurationsClient. </summary>
-        public virtual NetworkInterfaceTapConfigurationsClient GetNetworkInterfaceTapConfigurationsClient()
-        {
-            return new NetworkInterfaceTapConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfaceTapConfigurationsOperations. </summary>
+        public virtual NetworkInterfaceTapConfigurationsOperations NetworkInterfaceTapConfigurations => new NetworkInterfaceTapConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkProfilesClient. </summary>
-        public virtual NetworkProfilesClient GetNetworkProfilesClient()
-        {
-            return new NetworkProfilesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkProfilesOperations. </summary>
+        public virtual NetworkProfilesOperations NetworkProfiles => new NetworkProfilesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkSecurityGroupsClient. </summary>
-        public virtual NetworkSecurityGroupsClient GetNetworkSecurityGroupsClient()
-        {
-            return new NetworkSecurityGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkSecurityGroupsOperations. </summary>
+        public virtual NetworkSecurityGroupsOperations NetworkSecurityGroups => new NetworkSecurityGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SecurityRulesClient. </summary>
-        public virtual SecurityRulesClient GetSecurityRulesClient()
-        {
-            return new SecurityRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SecurityRulesOperations. </summary>
+        public virtual SecurityRulesOperations SecurityRules => new SecurityRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DefaultSecurityRulesClient. </summary>
-        public virtual DefaultSecurityRulesClient GetDefaultSecurityRulesClient()
-        {
-            return new DefaultSecurityRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DefaultSecurityRulesOperations. </summary>
+        public virtual DefaultSecurityRulesOperations DefaultSecurityRules => new DefaultSecurityRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkVirtualAppliancesClient. </summary>
-        public virtual NetworkVirtualAppliancesClient GetNetworkVirtualAppliancesClient()
-        {
-            return new NetworkVirtualAppliancesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkVirtualAppliancesOperations. </summary>
+        public virtual NetworkVirtualAppliancesOperations NetworkVirtualAppliances => new NetworkVirtualAppliancesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkWatchersClient. </summary>
-        public virtual NetworkWatchersClient GetNetworkWatchersClient()
-        {
-            return new NetworkWatchersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkWatchersOperations. </summary>
+        public virtual NetworkWatchersOperations NetworkWatchers => new NetworkWatchersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PacketCapturesClient. </summary>
-        public virtual PacketCapturesClient GetPacketCapturesClient()
-        {
-            return new PacketCapturesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PacketCapturesOperations. </summary>
+        public virtual PacketCapturesOperations PacketCaptures => new PacketCapturesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ConnectionMonitorsClient. </summary>
-        public virtual ConnectionMonitorsClient GetConnectionMonitorsClient()
-        {
-            return new ConnectionMonitorsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ConnectionMonitorsOperations. </summary>
+        public virtual ConnectionMonitorsOperations ConnectionMonitors => new ConnectionMonitorsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FlowLogsClient. </summary>
-        public virtual FlowLogsClient GetFlowLogsClient()
-        {
-            return new FlowLogsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FlowLogsOperations. </summary>
+        public virtual FlowLogsOperations FlowLogs => new FlowLogsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateEndpointsClient. </summary>
-        public virtual PrivateEndpointsClient GetPrivateEndpointsClient()
-        {
-            return new PrivateEndpointsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateEndpointsOperations. </summary>
+        public virtual PrivateEndpointsOperations PrivateEndpoints => new PrivateEndpointsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailablePrivateEndpointTypesClient. </summary>
-        public virtual AvailablePrivateEndpointTypesClient GetAvailablePrivateEndpointTypesClient()
-        {
-            return new AvailablePrivateEndpointTypesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailablePrivateEndpointTypesOperations. </summary>
+        public virtual AvailablePrivateEndpointTypesOperations AvailablePrivateEndpointTypes => new AvailablePrivateEndpointTypesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateDnsZoneGroupsClient. </summary>
-        public virtual PrivateDnsZoneGroupsClient GetPrivateDnsZoneGroupsClient()
-        {
-            return new PrivateDnsZoneGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateDnsZoneGroupsOperations. </summary>
+        public virtual PrivateDnsZoneGroupsOperations PrivateDnsZoneGroups => new PrivateDnsZoneGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateLinkServicesClient. </summary>
-        public virtual PrivateLinkServicesClient GetPrivateLinkServicesClient()
-        {
-            return new PrivateLinkServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateLinkServicesOperations. </summary>
+        public virtual PrivateLinkServicesOperations PrivateLinkServices => new PrivateLinkServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PublicIPAddressesClient. </summary>
-        public virtual PublicIPAddressesClient GetPublicIPAddressesClient()
-        {
-            return new PublicIPAddressesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PublicIPAddressesOperations. </summary>
+        public virtual PublicIPAddressesOperations PublicIPAddresses => new PublicIPAddressesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PublicIPPrefixesClient. </summary>
-        public virtual PublicIPPrefixesClient GetPublicIPPrefixesClient()
-        {
-            return new PublicIPPrefixesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PublicIPPrefixesOperations. </summary>
+        public virtual PublicIPPrefixesOperations PublicIPPrefixes => new PublicIPPrefixesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RouteFiltersClient. </summary>
-        public virtual RouteFiltersClient GetRouteFiltersClient()
-        {
-            return new RouteFiltersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RouteFiltersOperations. </summary>
+        public virtual RouteFiltersOperations RouteFilters => new RouteFiltersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RouteFilterRulesClient. </summary>
-        public virtual RouteFilterRulesClient GetRouteFilterRulesClient()
-        {
-            return new RouteFilterRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RouteFilterRulesOperations. </summary>
+        public virtual RouteFilterRulesOperations RouteFilterRules => new RouteFilterRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RouteTablesClient. </summary>
-        public virtual RouteTablesClient GetRouteTablesClient()
-        {
-            return new RouteTablesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RouteTablesOperations. </summary>
+        public virtual RouteTablesOperations RouteTables => new RouteTablesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RoutesClient. </summary>
-        public virtual RoutesClient GetRoutesClient()
-        {
-            return new RoutesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RoutesOperations. </summary>
+        public virtual RoutesOperations Routes => new RoutesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SecurityPartnerProvidersClient. </summary>
-        public virtual SecurityPartnerProvidersClient GetSecurityPartnerProvidersClient()
-        {
-            return new SecurityPartnerProvidersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SecurityPartnerProvidersOperations. </summary>
+        public virtual SecurityPartnerProvidersOperations SecurityPartnerProviders => new SecurityPartnerProvidersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BgpServiceCommunitiesClient. </summary>
-        public virtual BgpServiceCommunitiesClient GetBgpServiceCommunitiesClient()
-        {
-            return new BgpServiceCommunitiesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BgpServiceCommunitiesOperations. </summary>
+        public virtual BgpServiceCommunitiesOperations BgpServiceCommunities => new BgpServiceCommunitiesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceEndpointPoliciesClient. </summary>
-        public virtual ServiceEndpointPoliciesClient GetServiceEndpointPoliciesClient()
-        {
-            return new ServiceEndpointPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceEndpointPoliciesOperations. </summary>
+        public virtual ServiceEndpointPoliciesOperations ServiceEndpointPolicies => new ServiceEndpointPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceEndpointPolicyDefinitionsClient. </summary>
-        public virtual ServiceEndpointPolicyDefinitionsClient GetServiceEndpointPolicyDefinitionsClient()
-        {
-            return new ServiceEndpointPolicyDefinitionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceEndpointPolicyDefinitionsOperations. </summary>
+        public virtual ServiceEndpointPolicyDefinitionsOperations ServiceEndpointPolicyDefinitions => new ServiceEndpointPolicyDefinitionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceTagsClient. </summary>
-        public virtual ServiceTagsClient GetServiceTagsClient()
-        {
-            return new ServiceTagsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceTagsOperations. </summary>
+        public virtual ServiceTagsOperations ServiceTags => new ServiceTagsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of UsagesClient. </summary>
-        public virtual UsagesClient GetUsagesClient()
-        {
-            return new UsagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of UsagesOperations. </summary>
+        public virtual UsagesOperations Usages => new UsagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworksClient. </summary>
-        public virtual VirtualNetworksClient GetVirtualNetworksClient()
-        {
-            return new VirtualNetworksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworksOperations. </summary>
+        public virtual VirtualNetworksOperations VirtualNetworks => new VirtualNetworksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SubnetsClient. </summary>
-        public virtual SubnetsClient GetSubnetsClient()
-        {
-            return new SubnetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SubnetsOperations. </summary>
+        public virtual SubnetsOperations Subnets => new SubnetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceNavigationLinksClient. </summary>
-        public virtual ResourceNavigationLinksClient GetResourceNavigationLinksClient()
-        {
-            return new ResourceNavigationLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceNavigationLinksOperations. </summary>
+        public virtual ResourceNavigationLinksOperations ResourceNavigationLinks => new ResourceNavigationLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceAssociationLinksClient. </summary>
-        public virtual ServiceAssociationLinksClient GetServiceAssociationLinksClient()
-        {
-            return new ServiceAssociationLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceAssociationLinksOperations. </summary>
+        public virtual ServiceAssociationLinksOperations ServiceAssociationLinks => new ServiceAssociationLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkPeeringsClient. </summary>
-        public virtual VirtualNetworkPeeringsClient GetVirtualNetworkPeeringsClient()
-        {
-            return new VirtualNetworkPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkPeeringsOperations. </summary>
+        public virtual VirtualNetworkPeeringsOperations VirtualNetworkPeerings => new VirtualNetworkPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkGatewaysClient. </summary>
-        public virtual VirtualNetworkGatewaysClient GetVirtualNetworkGatewaysClient()
-        {
-            return new VirtualNetworkGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkGatewaysOperations. </summary>
+        public virtual VirtualNetworkGatewaysOperations VirtualNetworkGateways => new VirtualNetworkGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkGatewayConnectionsClient. </summary>
-        public virtual VirtualNetworkGatewayConnectionsClient GetVirtualNetworkGatewayConnectionsClient()
-        {
-            return new VirtualNetworkGatewayConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkGatewayConnectionsOperations. </summary>
+        public virtual VirtualNetworkGatewayConnectionsOperations VirtualNetworkGatewayConnections => new VirtualNetworkGatewayConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LocalNetworkGatewaysClient. </summary>
-        public virtual LocalNetworkGatewaysClient GetLocalNetworkGatewaysClient()
-        {
-            return new LocalNetworkGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LocalNetworkGatewaysOperations. </summary>
+        public virtual LocalNetworkGatewaysOperations LocalNetworkGateways => new LocalNetworkGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkTapsClient. </summary>
-        public virtual VirtualNetworkTapsClient GetVirtualNetworkTapsClient()
-        {
-            return new VirtualNetworkTapsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkTapsOperations. </summary>
+        public virtual VirtualNetworkTapsOperations VirtualNetworkTaps => new VirtualNetworkTapsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualRoutersClient. </summary>
-        public virtual VirtualRoutersClient GetVirtualRoutersClient()
-        {
-            return new VirtualRoutersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualRoutersOperations. </summary>
+        public virtual VirtualRoutersOperations VirtualRouters => new VirtualRoutersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualRouterPeeringsClient. </summary>
-        public virtual VirtualRouterPeeringsClient GetVirtualRouterPeeringsClient()
-        {
-            return new VirtualRouterPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualRouterPeeringsOperations. </summary>
+        public virtual VirtualRouterPeeringsOperations VirtualRouterPeerings => new VirtualRouterPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualWansClient. </summary>
-        public virtual VirtualWansClient GetVirtualWansClient()
-        {
-            return new VirtualWansClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualWansOperations. </summary>
+        public virtual VirtualWansOperations VirtualWans => new VirtualWansOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSitesClient. </summary>
-        public virtual VpnSitesClient GetVpnSitesClient()
-        {
-            return new VpnSitesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSitesOperations. </summary>
+        public virtual VpnSitesOperations VpnSites => new VpnSitesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSiteLinksClient. </summary>
-        public virtual VpnSiteLinksClient GetVpnSiteLinksClient()
-        {
-            return new VpnSiteLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSiteLinksOperations. </summary>
+        public virtual VpnSiteLinksOperations VpnSiteLinks => new VpnSiteLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSitesConfigurationClient. </summary>
-        public virtual VpnSitesConfigurationClient GetVpnSitesConfigurationClient()
-        {
-            return new VpnSitesConfigurationClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSitesConfigurationOperations. </summary>
+        public virtual VpnSitesConfigurationOperations VpnSitesConfiguration => new VpnSitesConfigurationOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnServerConfigurationsClient. </summary>
-        public virtual VpnServerConfigurationsClient GetVpnServerConfigurationsClient()
-        {
-            return new VpnServerConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnServerConfigurationsOperations. </summary>
+        public virtual VpnServerConfigurationsOperations VpnServerConfigurations => new VpnServerConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualHubsClient. </summary>
-        public virtual VirtualHubsClient GetVirtualHubsClient()
-        {
-            return new VirtualHubsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualHubsOperations. </summary>
+        public virtual VirtualHubsOperations VirtualHubs => new VirtualHubsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of HubVirtualNetworkConnectionsClient. </summary>
-        public virtual HubVirtualNetworkConnectionsClient GetHubVirtualNetworkConnectionsClient()
-        {
-            return new HubVirtualNetworkConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of HubVirtualNetworkConnectionsOperations. </summary>
+        public virtual HubVirtualNetworkConnectionsOperations HubVirtualNetworkConnections => new HubVirtualNetworkConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnGatewaysClient. </summary>
-        public virtual VpnGatewaysClient GetVpnGatewaysClient()
-        {
-            return new VpnGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnGatewaysOperations. </summary>
+        public virtual VpnGatewaysOperations VpnGateways => new VpnGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnConnectionsClient. </summary>
-        public virtual VpnConnectionsClient GetVpnConnectionsClient()
-        {
-            return new VpnConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnConnectionsOperations. </summary>
+        public virtual VpnConnectionsOperations VpnConnections => new VpnConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSiteLinkConnectionsClient. </summary>
-        public virtual VpnSiteLinkConnectionsClient GetVpnSiteLinkConnectionsClient()
-        {
-            return new VpnSiteLinkConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSiteLinkConnectionsOperations. </summary>
+        public virtual VpnSiteLinkConnectionsOperations VpnSiteLinkConnections => new VpnSiteLinkConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnLinkConnectionsClient. </summary>
-        public virtual VpnLinkConnectionsClient GetVpnLinkConnectionsClient()
-        {
-            return new VpnLinkConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnLinkConnectionsOperations. </summary>
+        public virtual VpnLinkConnectionsOperations VpnLinkConnections => new VpnLinkConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of P2SVpnGatewaysClient. </summary>
-        public virtual P2SVpnGatewaysClient GetP2SVpnGatewaysClient()
-        {
-            return new P2SVpnGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of P2SVpnGatewaysOperations. </summary>
+        public virtual P2SVpnGatewaysOperations P2SVpnGateways => new P2SVpnGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnServerConfigurationsAssociatedWithVirtualWanClient. </summary>
-        public virtual VpnServerConfigurationsAssociatedWithVirtualWanClient GetVpnServerConfigurationsAssociatedWithVirtualWanClient()
-        {
-            return new VpnServerConfigurationsAssociatedWithVirtualWanClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnServerConfigurationsAssociatedWithVirtualWanOperations. </summary>
+        public virtual VpnServerConfigurationsAssociatedWithVirtualWanOperations VpnServerConfigurationsAssociatedWithVirtualWan => new VpnServerConfigurationsAssociatedWithVirtualWanOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualHubRouteTableV2SClient. </summary>
-        public virtual VirtualHubRouteTableV2SClient GetVirtualHubRouteTableV2SClient()
-        {
-            return new VirtualHubRouteTableV2SClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualHubRouteTableV2SOperations. </summary>
+        public virtual VirtualHubRouteTableV2SOperations VirtualHubRouteTableV2S => new VirtualHubRouteTableV2SOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteGatewaysClient. </summary>
-        public virtual ExpressRouteGatewaysClient GetExpressRouteGatewaysClient()
-        {
-            return new ExpressRouteGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteGatewaysOperations. </summary>
+        public virtual ExpressRouteGatewaysOperations ExpressRouteGateways => new ExpressRouteGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteConnectionsClient. </summary>
-        public virtual ExpressRouteConnectionsClient GetExpressRouteConnectionsClient()
-        {
-            return new ExpressRouteConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteConnectionsOperations. </summary>
+        public virtual ExpressRouteConnectionsOperations ExpressRouteConnections => new ExpressRouteConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of HubRouteTablesClient. </summary>
-        public virtual HubRouteTablesClient GetHubRouteTablesClient()
-        {
-            return new HubRouteTablesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of HubRouteTablesOperations. </summary>
+        public virtual HubRouteTablesOperations HubRouteTables => new HubRouteTablesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of WebApplicationFirewallPoliciesClient. </summary>
-        public virtual WebApplicationFirewallPoliciesClient GetWebApplicationFirewallPoliciesClient()
-        {
-            return new WebApplicationFirewallPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of WebApplicationFirewallPoliciesOperations. </summary>
+        public virtual WebApplicationFirewallPoliciesOperations WebApplicationFirewallPolicies => new WebApplicationFirewallPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesOperations.cs
index 11cc898c4e3e4..e1b0885381249 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkProfiles service client. </summary>
-    public partial class NetworkProfilesClient
+    public partial class NetworkProfilesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkProfilesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkProfilesClient for mocking. </summary>
-        protected NetworkProfilesClient()
+        internal NetworkProfilesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkProfilesOperations for mocking. </summary>
+        protected NetworkProfilesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkProfilesClient. </summary>
+        /// <summary> Initializes a new instance of NetworkProfilesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkProfilesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkProfilesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkProfilesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkProfilesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkProfilesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkProfile>> GetAsync(string resourceGroupName, string networkProfileName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkProfile>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkProfile> Get(string resourceGroupName, string networkProfileName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkProfile> Get(string resourceGroupName, string net
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkProfile>> CreateOrUpdateAsync(string resourceGroupName, string networkProfileName, NetworkProfile parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkProfile>> CreateOrUpdateAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkProfile> CreateOrUpdate(string resourceGroupName, string networkProfileName, NetworkProfile parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -124,7 +124,7 @@ public virtual Response<NetworkProfile> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkProfile>> UpdateTagsAsync(string resourceGroupName, string networkProfileName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -144,7 +144,7 @@ public virtual async Task<Response<NetworkProfile>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkProfile> UpdateTags(string resourceGroupName, string networkProfileName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -163,7 +163,7 @@ public virtual AsyncPageable<NetworkProfile> ListAllAsync(CancellationToken canc
         {
             async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -178,7 +178,7 @@ async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkProfile>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -200,7 +200,7 @@ public virtual Pageable<NetworkProfile> ListAll(CancellationToken cancellationTo
         {
             Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkProfile> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -243,7 +243,7 @@ public virtual AsyncPageable<NetworkProfile> ListAsync(string resourceGroupName,
 
             async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -258,7 +258,7 @@ async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkProfile>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ public virtual Pageable<NetworkProfile> List(string resourceGroupName, Cancellat
 
             Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -301,7 +301,7 @@ Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkProfile> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -332,7 +332,7 @@ public virtual async Task<NetworkProfilesDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(networkProfileName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -361,7 +361,7 @@ public virtual NetworkProfilesDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(networkProfileName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesRestOperations.cs
index e0aa5804d2812..16a53fa47371f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkProfilesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkProfilesRestClient
+    internal partial class NetworkProfilesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkProfilesRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkProfilesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkProfilesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkProfilesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsOperations.cs
index c47a7bbf51743..f452c9e10385c 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkSecurityGroups service client. </summary>
-    public partial class NetworkSecurityGroupsClient
+    public partial class NetworkSecurityGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkSecurityGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkSecurityGroupsClient for mocking. </summary>
-        protected NetworkSecurityGroupsClient()
+        internal NetworkSecurityGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkSecurityGroupsOperations for mocking. </summary>
+        protected NetworkSecurityGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkSecurityGroupsClient. </summary>
+        /// <summary> Initializes a new instance of NetworkSecurityGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkSecurityGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkSecurityGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkSecurityGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkSecurityGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkSecurityGroupsClient(ClientDiagnostics clientDiagnostics, HttpPi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkSecurityGroup>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkSecurityGroup>> GetAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkSecurityGroup> Get(string resourceGroupName, string networkSecurityGroupName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkSecurityGroup> Get(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string networkSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkSecurityGroup>> UpdateTagsAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkSecurityGroup> UpdateTags(string resourceGroupName, string networkSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<NetworkSecurityGroup> ListAllAsync(CancellationToke
         {
             async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<NetworkSecurityGroup> ListAll(CancellationToken cancella
         {
             Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<NetworkSecurityGroup> ListAsync(string resourceGrou
 
             async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<NetworkSecurityGroup> List(string resourceGroupName, Can
 
             Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<NetworkSecurityGroupsDeleteOperation> StartDeleteAsync
                 throw new ArgumentNullException(nameof(networkSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual NetworkSecurityGroupsDeleteOperation StartDelete(string resourceG
                 throw new ArgumentNullException(nameof(networkSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<NetworkSecurityGroupsCreateOrUpdateOperation> StartCre
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual NetworkSecurityGroupsCreateOrUpdateOperation StartCreateOrUpdate(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsRestOperations.cs
index 9a198d9a28e9d..183de0dea60c5 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkSecurityGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkSecurityGroupsRestClient
+    internal partial class NetworkSecurityGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkSecurityGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkSecurityGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkSecurityGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkSecurityGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesOperations.cs
index 29d1fcbeb0340..0efc8a4743736 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkVirtualAppliances service client. </summary>
-    public partial class NetworkVirtualAppliancesClient
+    public partial class NetworkVirtualAppliancesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkVirtualAppliancesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkVirtualAppliancesClient for mocking. </summary>
-        protected NetworkVirtualAppliancesClient()
+        internal NetworkVirtualAppliancesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkVirtualAppliancesOperations for mocking. </summary>
+        protected NetworkVirtualAppliancesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkVirtualAppliancesClient. </summary>
+        /// <summary> Initializes a new instance of NetworkVirtualAppliancesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkVirtualAppliancesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkVirtualAppliancesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkVirtualAppliancesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkVirtualAppliancesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkVirtualAppliancesClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkVirtualAppliance>> GetAsync(string resourceGroupName, string networkVirtualApplianceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkVirtualAppliance>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkVirtualAppliance> Get(string resourceGroupName, string networkVirtualApplianceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkVirtualAppliance> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkVirtualAppliance>> UpdateTagsAsync(string resourceGroupName, string networkVirtualApplianceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkVirtualAppliance>> UpdateTagsAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkVirtualAppliance> UpdateTags(string resourceGroupName, string networkVirtualApplianceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<NetworkVirtualAppliance> ListByResourceGroupAsync(s
 
             async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkVirtualAppliance>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<NetworkVirtualAppliance> ListByResourceGroup(string reso
 
             Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkVirtualAppliance> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<NetworkVirtualAppliance> ListAsync(CancellationToke
         {
             async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkVirtualAppliance>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<NetworkVirtualAppliance> List(CancellationToken cancella
         {
             Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkVirtualAppliance> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<NetworkVirtualAppliancesDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(networkVirtualApplianceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual NetworkVirtualAppliancesDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(networkVirtualApplianceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<NetworkVirtualAppliancesCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual NetworkVirtualAppliancesCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesRestOperations.cs
index 50a8a00f4dd65..485d9c68cc9b0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkVirtualAppliancesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkVirtualAppliancesRestClient
+    internal partial class NetworkVirtualAppliancesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkVirtualAppliancesRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkVirtualAppliancesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkVirtualAppliancesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkVirtualAppliancesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersOperations.cs
index 099b7b4d8e483..ec58931e0f65b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The NetworkWatchers service client. </summary>
-    public partial class NetworkWatchersClient
+    public partial class NetworkWatchersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkWatchersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkWatchersClient for mocking. </summary>
-        protected NetworkWatchersClient()
+        internal NetworkWatchersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkWatchersOperations for mocking. </summary>
+        protected NetworkWatchersOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkWatchersClient. </summary>
+        /// <summary> Initializes a new instance of NetworkWatchersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkWatchersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkWatchersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkWatchersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkWatchersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkWatchersClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkWatcher>> CreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, NetworkWatcher parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkWatcher>> CreateOrUpdateAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkWatcher> CreateOrUpdate(string resourceGroupName, string networkWatcherName, NetworkWatcher parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<NetworkWatcher> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkWatcher>> GetAsync(string resourceGroupName, string networkWatcherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.Get");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<NetworkWatcher>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkWatcher> Get(string resourceGroupName, string networkWatcherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.Get");
             scope.Start();
             try
             {
@@ -122,7 +122,7 @@ public virtual Response<NetworkWatcher> Get(string resourceGroupName, string net
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkWatcher>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response<NetworkWatcher>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkWatcher> UpdateTags(string resourceGroupName, string networkWatcherName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -162,7 +162,7 @@ public virtual Response<NetworkWatcher> UpdateTags(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Topology>> GetTopologyAsync(string resourceGroupName, string networkWatcherName, TopologyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.GetTopology");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.GetTopology");
             scope.Start();
             try
             {
@@ -182,7 +182,7 @@ public virtual async Task<Response<Topology>> GetTopologyAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Topology> GetTopology(string resourceGroupName, string networkWatcherName, TopologyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.GetTopology");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.GetTopology");
             scope.Start();
             try
             {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<NetworkWatcher> ListAsync(string resourceGroupName,
 
             async Task<Page<NetworkWatcher>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.List");
                 scope.Start();
                 try
                 {
@@ -235,7 +235,7 @@ public virtual Pageable<NetworkWatcher> List(string resourceGroupName, Cancellat
 
             Page<NetworkWatcher> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.List");
                 scope.Start();
                 try
                 {
@@ -257,7 +257,7 @@ public virtual AsyncPageable<NetworkWatcher> ListAllAsync(CancellationToken canc
         {
             async Task<Page<NetworkWatcher>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -279,7 +279,7 @@ public virtual Pageable<NetworkWatcher> ListAll(CancellationToken cancellationTo
         {
             Page<NetworkWatcher> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -310,7 +310,7 @@ public virtual async Task<NetworkWatchersDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(networkWatcherName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -339,7 +339,7 @@ public virtual NetworkWatchersDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(networkWatcherName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -373,7 +373,7 @@ public virtual async Task<NetworkWatchersVerifyIPFlowOperation> StartVerifyIPFlo
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartVerifyIPFlow");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartVerifyIPFlow");
             scope.Start();
             try
             {
@@ -407,7 +407,7 @@ public virtual NetworkWatchersVerifyIPFlowOperation StartVerifyIPFlow(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartVerifyIPFlow");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartVerifyIPFlow");
             scope.Start();
             try
             {
@@ -441,7 +441,7 @@ public virtual async Task<NetworkWatchersGetNextHopOperation> StartGetNextHopAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNextHop");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNextHop");
             scope.Start();
             try
             {
@@ -475,7 +475,7 @@ public virtual NetworkWatchersGetNextHopOperation StartGetNextHop(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNextHop");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNextHop");
             scope.Start();
             try
             {
@@ -509,7 +509,7 @@ public virtual async Task<NetworkWatchersGetVMSecurityRulesOperation> StartGetVM
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetVMSecurityRules");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetVMSecurityRules");
             scope.Start();
             try
             {
@@ -543,7 +543,7 @@ public virtual NetworkWatchersGetVMSecurityRulesOperation StartGetVMSecurityRule
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetVMSecurityRules");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetVMSecurityRules");
             scope.Start();
             try
             {
@@ -577,7 +577,7 @@ public virtual async Task<NetworkWatchersGetTroubleshootingOperation> StartGetTr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshooting");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshooting");
             scope.Start();
             try
             {
@@ -611,7 +611,7 @@ public virtual NetworkWatchersGetTroubleshootingOperation StartGetTroubleshootin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshooting");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshooting");
             scope.Start();
             try
             {
@@ -645,7 +645,7 @@ public virtual async Task<NetworkWatchersGetTroubleshootingResultOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshootingResult");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshootingResult");
             scope.Start();
             try
             {
@@ -679,7 +679,7 @@ public virtual NetworkWatchersGetTroubleshootingResultOperation StartGetTroubles
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshootingResult");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshootingResult");
             scope.Start();
             try
             {
@@ -713,7 +713,7 @@ public virtual async Task<NetworkWatchersSetFlowLogConfigurationOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartSetFlowLogConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartSetFlowLogConfiguration");
             scope.Start();
             try
             {
@@ -747,7 +747,7 @@ public virtual NetworkWatchersSetFlowLogConfigurationOperation StartSetFlowLogCo
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartSetFlowLogConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartSetFlowLogConfiguration");
             scope.Start();
             try
             {
@@ -781,7 +781,7 @@ public virtual async Task<NetworkWatchersGetFlowLogStatusOperation> StartGetFlow
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetFlowLogStatus");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetFlowLogStatus");
             scope.Start();
             try
             {
@@ -815,7 +815,7 @@ public virtual NetworkWatchersGetFlowLogStatusOperation StartGetFlowLogStatus(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetFlowLogStatus");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetFlowLogStatus");
             scope.Start();
             try
             {
@@ -849,7 +849,7 @@ public virtual async Task<NetworkWatchersCheckConnectivityOperation> StartCheckC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartCheckConnectivity");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartCheckConnectivity");
             scope.Start();
             try
             {
@@ -883,7 +883,7 @@ public virtual NetworkWatchersCheckConnectivityOperation StartCheckConnectivity(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartCheckConnectivity");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartCheckConnectivity");
             scope.Start();
             try
             {
@@ -917,7 +917,7 @@ public virtual async Task<NetworkWatchersGetAzureReachabilityReportOperation> St
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetAzureReachabilityReport");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetAzureReachabilityReport");
             scope.Start();
             try
             {
@@ -951,7 +951,7 @@ public virtual NetworkWatchersGetAzureReachabilityReportOperation StartGetAzureR
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetAzureReachabilityReport");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetAzureReachabilityReport");
             scope.Start();
             try
             {
@@ -985,7 +985,7 @@ public virtual async Task<NetworkWatchersListAvailableProvidersOperation> StartL
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartListAvailableProviders");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartListAvailableProviders");
             scope.Start();
             try
             {
@@ -1019,7 +1019,7 @@ public virtual NetworkWatchersListAvailableProvidersOperation StartListAvailable
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartListAvailableProviders");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartListAvailableProviders");
             scope.Start();
             try
             {
@@ -1053,7 +1053,7 @@ public virtual async Task<NetworkWatchersGetNetworkConfigurationDiagnosticOperat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNetworkConfigurationDiagnostic");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNetworkConfigurationDiagnostic");
             scope.Start();
             try
             {
@@ -1087,7 +1087,7 @@ public virtual NetworkWatchersGetNetworkConfigurationDiagnosticOperation StartGe
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNetworkConfigurationDiagnostic");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNetworkConfigurationDiagnostic");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersRestOperations.cs
index 3f16b039a480f..1007f306dd012 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/NetworkWatchersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class NetworkWatchersRestClient
+    internal partial class NetworkWatchersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkWatchersRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkWatchersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkWatchersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkWatchersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/OperationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/Operations.cs
similarity index 85%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/OperationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/Operations.cs
index b87b2c07daff0..e38ac91b2d41b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/OperationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/Operations.cs
@@ -15,23 +15,23 @@
 
 namespace Azure.ResourceManager.Network
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Operation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<Operation> FirstPageFunc(int? pageSizeHint)
             }
             Page<Operation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysOperations.cs
index e82abd671a1a7..bbdfc259ac018 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The P2SVpnGateways service client. </summary>
-    public partial class P2SVpnGatewaysClient
+    public partial class P2SVpnGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal P2SVpnGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of P2SVpnGatewaysClient for mocking. </summary>
-        protected P2SVpnGatewaysClient()
+        internal P2SVpnGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of P2SVpnGatewaysOperations for mocking. </summary>
+        protected P2SVpnGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of P2SVpnGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of P2SVpnGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal P2SVpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal P2SVpnGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new P2SVpnGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new P2SVpnGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal P2SVpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<P2SVpnGateway>> GetAsync(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<P2SVpnGateway>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<P2SVpnGateway> Get(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<P2SVpnGateway> Get(string resourceGroupName, string gate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<P2SVpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, TagsObject p2SVpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<P2SVpnGateway>> UpdateTagsAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<P2SVpnGateway> UpdateTags(string resourceGroupName, string gatewayName, TagsObject p2SVpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<P2SVpnGateway> ListByResourceGroupAsync(string reso
 
             async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<P2SVpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<P2SVpnGateway> ListByResourceGroup(string resourceGroupN
 
             Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<P2SVpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<P2SVpnGateway> ListAsync(CancellationToken cancella
         {
             async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<P2SVpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<P2SVpnGateway> List(CancellationToken cancellationToken
         {
             Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<P2SVpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<P2SVpnGatewaysCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(p2SVpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual P2SVpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(p2SVpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<P2SVpnGatewaysDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual P2SVpnGatewaysDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -421,7 +421,7 @@ public virtual async Task<P2SVpnGatewaysGenerateVpnProfileOperation> StartGenera
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -455,7 +455,7 @@ public virtual P2SVpnGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -484,7 +484,7 @@ public virtual async Task<P2SVpnGatewaysGetP2SVpnConnectionHealthOperation> Star
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealth");
             scope.Start();
             try
             {
@@ -513,7 +513,7 @@ public virtual P2SVpnGatewaysGetP2SVpnConnectionHealthOperation StartGetP2SVpnCo
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealth");
             scope.Start();
             try
             {
@@ -547,7 +547,7 @@ public virtual async Task<P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperati
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealthDetailed");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealthDetailed");
             scope.Start();
             try
             {
@@ -581,7 +581,7 @@ public virtual P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation StartGet
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealthDetailed");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealthDetailed");
             scope.Start();
             try
             {
@@ -615,7 +615,7 @@ public virtual async Task<P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation> St
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDisconnectP2SVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDisconnectP2SVpnConnections");
             scope.Start();
             try
             {
@@ -649,7 +649,7 @@ public virtual P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation StartDisconnec
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDisconnectP2SVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDisconnectP2SVpnConnections");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysRestOperations.cs
index 9a185656c0da8..50dc35706ec26 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/P2SVpnGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class P2SVpnGatewaysRestClient
+    internal partial class P2SVpnGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of P2SVpnGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of P2SVpnGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public P2SVpnGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public P2SVpnGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesOperations.cs
index 7cc34d9a2a3b9..9b29c8cbe0be1 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PacketCaptures service client. </summary>
-    public partial class PacketCapturesClient
+    public partial class PacketCapturesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PacketCapturesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PacketCapturesClient for mocking. </summary>
-        protected PacketCapturesClient()
+        internal PacketCapturesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PacketCapturesOperations for mocking. </summary>
+        protected PacketCapturesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PacketCapturesClient. </summary>
+        /// <summary> Initializes a new instance of PacketCapturesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PacketCapturesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PacketCapturesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PacketCapturesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PacketCapturesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PacketCapturesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PacketCaptureResult>> GetAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PacketCaptureResult>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PacketCaptureResult> Get(string resourceGroupName, string networkWatcherName, string packetCaptureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<PacketCaptureResult> ListAsync(string resourceGroup
 
             async Task<Page<PacketCaptureResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -127,7 +127,7 @@ public virtual Pageable<PacketCaptureResult> List(string resourceGroupName, stri
 
             Page<PacketCaptureResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -168,7 +168,7 @@ public virtual async Task<PacketCapturesCreateOperation> StartCreateAsync(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartCreate");
             scope.Start();
             try
             {
@@ -207,7 +207,7 @@ public virtual PacketCapturesCreateOperation StartCreate(string resourceGroupNam
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartCreate");
             scope.Start();
             try
             {
@@ -241,7 +241,7 @@ public virtual async Task<PacketCapturesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -275,7 +275,7 @@ public virtual PacketCapturesDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -309,7 +309,7 @@ public virtual async Task<PacketCapturesStopOperation> StartStopAsync(string res
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartStop");
             scope.Start();
             try
             {
@@ -343,7 +343,7 @@ public virtual PacketCapturesStopOperation StartStop(string resourceGroupName, s
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartStop");
             scope.Start();
             try
             {
@@ -377,7 +377,7 @@ public virtual async Task<PacketCapturesGetStatusOperation> StartGetStatusAsync(
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartGetStatus");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartGetStatus");
             scope.Start();
             try
             {
@@ -411,7 +411,7 @@ public virtual PacketCapturesGetStatusOperation StartGetStatus(string resourceGr
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartGetStatus");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartGetStatus");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesRestOperations.cs
index 08d40283cf1ed..ebc37a893e6b0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PacketCapturesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PacketCapturesRestClient
+    internal partial class PacketCapturesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PacketCapturesRestClient. </summary>
+        /// <summary> Initializes a new instance of PacketCapturesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PacketCapturesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PacketCapturesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsOperations.cs
similarity index 90%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsOperations.cs
index 8b6883e8f2ffd..9eaf7bbd85c92 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PeerExpressRouteCircuitConnections service client. </summary>
-    public partial class PeerExpressRouteCircuitConnectionsClient
+    public partial class PeerExpressRouteCircuitConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PeerExpressRouteCircuitConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsClient for mocking. </summary>
-        protected PeerExpressRouteCircuitConnectionsClient()
+        internal PeerExpressRouteCircuitConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsOperations for mocking. </summary>
+        protected PeerExpressRouteCircuitConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PeerExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PeerExpressRouteCircuitConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PeerExpressRouteCircuitConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PeerExpressRouteCircuitConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal PeerExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagno
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PeerExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<PeerExpressRouteCircuitConnection>> GetAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PeerExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<PeerExpressRouteCircuitConnection> ListAsync(string
 
             async Task<Page<PeerExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<PeerExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeH
             }
             async Task<Page<PeerExpressRouteCircuitConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<PeerExpressRouteCircuitConnection> List(string resourceG
 
             Page<PeerExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<PeerExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<PeerExpressRouteCircuitConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsRestOperations.cs
index 16b4b6990fbda..1e198836bcc96 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PeerExpressRouteCircuitConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PeerExpressRouteCircuitConnectionsRestClient
+    internal partial class PeerExpressRouteCircuitConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PeerExpressRouteCircuitConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PeerExpressRouteCircuitConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsOperations.cs
index 0d52120ef314c..5c6fe1f003dd6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PrivateDnsZoneGroups service client. </summary>
-    public partial class PrivateDnsZoneGroupsClient
+    public partial class PrivateDnsZoneGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateDnsZoneGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsClient for mocking. </summary>
-        protected PrivateDnsZoneGroupsClient()
+        internal PrivateDnsZoneGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsOperations for mocking. </summary>
+        protected PrivateDnsZoneGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PrivateDnsZoneGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PrivateDnsZoneGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PrivateDnsZoneGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PrivateDnsZoneGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateDnsZoneGroupsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateDnsZoneGroup>> GetAsync(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateDnsZoneGroup>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateDnsZoneGroup> Get(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<PrivateDnsZoneGroup> ListAsync(string privateEndpoi
 
             async Task<Page<PrivateDnsZoneGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<PrivateDnsZoneGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateDnsZoneGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<PrivateDnsZoneGroup> List(string privateEndpointName, st
 
             Page<PrivateDnsZoneGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<PrivateDnsZoneGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateDnsZoneGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<PrivateDnsZoneGroupsDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(privateDnsZoneGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual PrivateDnsZoneGroupsDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(privateDnsZoneGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<PrivateDnsZoneGroupsCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual PrivateDnsZoneGroupsCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsRestOperations.cs
index 2e2c521b29412..ad9206b4c0209 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateDnsZoneGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PrivateDnsZoneGroupsRestClient
+    internal partial class PrivateDnsZoneGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateDnsZoneGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PrivateDnsZoneGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsOperations.cs
index 72fce6cd25eea..84eec4a54b48d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PrivateEndpoints service client. </summary>
-    public partial class PrivateEndpointsClient
+    public partial class PrivateEndpointsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateEndpointsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateEndpointsClient for mocking. </summary>
-        protected PrivateEndpointsClient()
+        internal PrivateEndpointsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateEndpointsOperations for mocking. </summary>
+        protected PrivateEndpointsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateEndpointsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PrivateEndpointsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PrivateEndpointsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PrivateEndpointsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PrivateEndpointsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateEndpointsClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpoint>> GetAsync(string resourceGroupName, string privateEndpointName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateEndpoint>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpoint> Get(string resourceGroupName, string privateEndpointName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<PrivateEndpoint> ListAsync(string resourceGroupName
 
             async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpoint>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<PrivateEndpoint> List(string resourceGroupName, Cancella
 
             Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpoint> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<PrivateEndpoint> ListBySubscriptionAsync(Cancellati
         {
             async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpoint>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<PrivateEndpoint> ListBySubscription(CancellationToken ca
         {
             Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpoint> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ public virtual async Task<PrivateEndpointsDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(privateEndpointName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -281,7 +281,7 @@ public virtual PrivateEndpointsDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(privateEndpointName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual async Task<PrivateEndpointsCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual PrivateEndpointsCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsRestOperations.cs
index 17f81755d93bd..734c4fad235f1 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateEndpointsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PrivateEndpointsRestClient
+    internal partial class PrivateEndpointsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateEndpointsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateEndpointsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PrivateEndpointsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesOperations.cs
index d7d8543f42c05..387b087f252c6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PrivateLinkServices service client. </summary>
-    public partial class PrivateLinkServicesClient
+    public partial class PrivateLinkServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateLinkServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateLinkServicesClient for mocking. </summary>
-        protected PrivateLinkServicesClient()
+        internal PrivateLinkServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateLinkServicesOperations for mocking. </summary>
+        protected PrivateLinkServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateLinkServicesClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PrivateLinkServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PrivateLinkServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PrivateLinkServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PrivateLinkServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateLinkServicesClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkService>> GetAsync(string resourceGroupName, string serviceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateLinkService>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkService> Get(string resourceGroupName, string serviceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<PrivateLinkService> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> GetPrivateEndpointConnectionAsync(string resourceGroupName, string serviceName, string peConnectionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.GetPrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.GetPrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -106,7 +106,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> GetPrivateEndpoin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> GetPrivateEndpointConnection(string resourceGroupName, string serviceName, string peConnectionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.GetPrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.GetPrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<PrivateEndpointConnection> GetPrivateEndpointConnection(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> UpdatePrivateEndpointConnectionAsync(string resourceGroupName, string serviceName, string peConnectionName, PrivateEndpointConnection parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.UpdatePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.UpdatePrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -148,7 +148,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> UpdatePrivateEndp
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> UpdatePrivateEndpointConnection(string resourceGroupName, string serviceName, string peConnectionName, PrivateEndpointConnection parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.UpdatePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.UpdatePrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -167,7 +167,7 @@ public virtual Response<PrivateEndpointConnection> UpdatePrivateEndpointConnecti
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLinkServiceVisibilityAsync(string location, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibility");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibility");
             scope.Start();
             try
             {
@@ -186,7 +186,7 @@ public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibility(string location, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibility");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibility");
             scope.Start();
             try
             {
@@ -206,7 +206,7 @@ public virtual Response<PrivateLinkServiceVisibility> CheckPrivateLinkServiceVis
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLinkServiceVisibilityByResourceGroupAsync(string location, string resourceGroupName, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibilityByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibilityByResourceGroup");
             scope.Start();
             try
             {
@@ -226,7 +226,7 @@ public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibilityByResourceGroup(string location, string resourceGroupName, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibilityByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibilityByResourceGroup");
             scope.Start();
             try
             {
@@ -251,7 +251,7 @@ public virtual AsyncPageable<PrivateLinkService> ListAsync(string resourceGroupN
 
             async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -266,7 +266,7 @@ async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -294,7 +294,7 @@ public virtual Pageable<PrivateLinkService> List(string resourceGroupName, Cance
 
             Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -309,7 +309,7 @@ Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -331,7 +331,7 @@ public virtual AsyncPageable<PrivateLinkService> ListBySubscriptionAsync(Cancell
         {
             async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -346,7 +346,7 @@ async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -368,7 +368,7 @@ public virtual Pageable<PrivateLinkService> ListBySubscription(CancellationToken
         {
             Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -383,7 +383,7 @@ Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -416,7 +416,7 @@ public virtual AsyncPageable<PrivateEndpointConnection> ListPrivateEndpointConne
 
             async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -431,7 +431,7 @@ async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpointConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -464,7 +464,7 @@ public virtual Pageable<PrivateEndpointConnection> ListPrivateEndpointConnection
 
             Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -479,7 +479,7 @@ Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpointConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -507,7 +507,7 @@ public virtual AsyncPageable<AutoApprovedPrivateLinkService> ListAutoApprovedPri
 
             async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -522,7 +522,7 @@ async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint
             }
             async Task<Page<AutoApprovedPrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -550,7 +550,7 @@ public virtual Pageable<AutoApprovedPrivateLinkService> ListAutoApprovedPrivateL
 
             Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -565,7 +565,7 @@ Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<AutoApprovedPrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -598,7 +598,7 @@ public virtual AsyncPageable<AutoApprovedPrivateLinkService> ListAutoApprovedPri
 
             async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -613,7 +613,7 @@ async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint
             }
             async Task<Page<AutoApprovedPrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -646,7 +646,7 @@ public virtual Pageable<AutoApprovedPrivateLinkService> ListAutoApprovedPrivateL
 
             Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -661,7 +661,7 @@ Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<AutoApprovedPrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -692,7 +692,7 @@ public virtual async Task<PrivateLinkServicesDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(serviceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -721,7 +721,7 @@ public virtual PrivateLinkServicesDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(serviceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -755,7 +755,7 @@ public virtual async Task<PrivateLinkServicesCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -789,7 +789,7 @@ public virtual PrivateLinkServicesCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -823,7 +823,7 @@ public virtual async Task<PrivateLinkServicesDeletePrivateEndpointConnectionOper
                 throw new ArgumentNullException(nameof(peConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDeletePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDeletePrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -857,7 +857,7 @@ public virtual PrivateLinkServicesDeletePrivateEndpointConnectionOperation Start
                 throw new ArgumentNullException(nameof(peConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDeletePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDeletePrivateEndpointConnection");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesRestOperations.cs
index 8511a39b0f6d9..6f9549b058af4 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PrivateLinkServicesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PrivateLinkServicesRestClient
+    internal partial class PrivateLinkServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateLinkServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateLinkServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PrivateLinkServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesOperations.cs
index c79c0000b3f5f..66fbe2d7c5725 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PublicIPAddresses service client. </summary>
-    public partial class PublicIPAddressesClient
+    public partial class PublicIPAddressesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PublicIPAddressesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PublicIPAddressesClient for mocking. </summary>
-        protected PublicIPAddressesClient()
+        internal PublicIPAddressesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PublicIPAddressesOperations for mocking. </summary>
+        protected PublicIPAddressesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PublicIPAddressesClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPAddressesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PublicIPAddressesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PublicIPAddressesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PublicIPAddressesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PublicIPAddressesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PublicIPAddressesClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPAddress>> GetAsync(string resourceGroupName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PublicIPAddress>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPAddress> Get(string resourceGroupName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<PublicIPAddress> Get(string resourceGroupName, string pu
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPAddress>> UpdateTagsAsync(string resourceGroupName, string publicIpAddressName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<PublicIPAddress>> UpdateTagsAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPAddress> UpdateTags(string resourceGroupName, string publicIpAddressName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -128,7 +128,7 @@ public virtual Response<PublicIPAddress> UpdateTags(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPAddress>> GetVirtualMachineScaleSetPublicIPAddressAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.GetVirtualMachineScaleSetPublicIPAddress");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.GetVirtualMachineScaleSetPublicIPAddress");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual async Task<Response<PublicIPAddress>> GetVirtualMachineScaleSetPu
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPAddress> GetVirtualMachineScaleSetPublicIPAddress(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.GetVirtualMachineScaleSetPublicIPAddress");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.GetVirtualMachineScaleSetPublicIPAddress");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual AsyncPageable<PublicIPAddress> ListAllAsync(CancellationToken can
         {
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -186,7 +186,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -208,7 +208,7 @@ public virtual Pageable<PublicIPAddress> ListAll(CancellationToken cancellationT
         {
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -223,7 +223,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -251,7 +251,7 @@ public virtual AsyncPageable<PublicIPAddress> ListAsync(string resourceGroupName
 
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -266,7 +266,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -294,7 +294,7 @@ public virtual Pageable<PublicIPAddress> List(string resourceGroupName, Cancella
 
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -309,7 +309,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -342,7 +342,7 @@ public virtual AsyncPageable<PublicIPAddress> ListVirtualMachineScaleSetPublicIP
 
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -357,7 +357,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -390,7 +390,7 @@ public virtual Pageable<PublicIPAddress> ListVirtualMachineScaleSetPublicIPAddre
 
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -405,7 +405,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -453,7 +453,7 @@ public virtual AsyncPageable<PublicIPAddress> ListVirtualMachineScaleSetVMPublic
 
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -468,7 +468,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -516,7 +516,7 @@ public virtual Pageable<PublicIPAddress> ListVirtualMachineScaleSetVMPublicIPAdd
 
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -531,7 +531,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -562,7 +562,7 @@ public virtual async Task<PublicIPAddressesDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(publicIpAddressName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -591,7 +591,7 @@ public virtual PublicIPAddressesDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(publicIpAddressName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -625,7 +625,7 @@ public virtual async Task<PublicIPAddressesCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -659,7 +659,7 @@ public virtual PublicIPAddressesCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesRestOperations.cs
index b390faa795232..932be43fdbd28 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPAddressesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PublicIPAddressesRestClient
+    internal partial class PublicIPAddressesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PublicIPAddressesRestClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPAddressesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PublicIPAddressesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PublicIPAddressesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesOperations.cs
index 2f77f9e4a7e12..f93c87cc037ad 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The PublicIPPrefixes service client. </summary>
-    public partial class PublicIPPrefixesClient
+    public partial class PublicIPPrefixesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PublicIPPrefixesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PublicIPPrefixesClient for mocking. </summary>
-        protected PublicIPPrefixesClient()
+        internal PublicIPPrefixesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PublicIPPrefixesOperations for mocking. </summary>
+        protected PublicIPPrefixesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PublicIPPrefixesClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPPrefixesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PublicIPPrefixesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PublicIPPrefixesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PublicIPPrefixesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PublicIPPrefixesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PublicIPPrefixesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPPrefix>> GetAsync(string resourceGroupName, string publicIpPrefixName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PublicIPPrefix>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPPrefix> Get(string resourceGroupName, string publicIpPrefixName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<PublicIPPrefix> Get(string resourceGroupName, string pub
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPPrefix>> UpdateTagsAsync(string resourceGroupName, string publicIpPrefixName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<PublicIPPrefix>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPPrefix> UpdateTags(string resourceGroupName, string publicIpPrefixName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<PublicIPPrefix> ListAllAsync(CancellationToken canc
         {
             async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPPrefix>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<PublicIPPrefix> ListAll(CancellationToken cancellationTo
         {
             Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPPrefix> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<PublicIPPrefix> ListAsync(string resourceGroupName,
 
             async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPPrefix>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<PublicIPPrefix> List(string resourceGroupName, Cancellat
 
             Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPPrefix> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<PublicIPPrefixesDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(publicIpPrefixName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual PublicIPPrefixesDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(publicIpPrefixName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<PublicIPPrefixesCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual PublicIPPrefixesCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesRestOperations.cs
index f1dbe05120047..28840f4e4ffae 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/PublicIPPrefixesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class PublicIPPrefixesRestClient
+    internal partial class PublicIPPrefixesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PublicIPPrefixesRestClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPPrefixesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PublicIPPrefixesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PublicIPPrefixesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksOperations.cs
similarity index 84%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksOperations.cs
index 7823ae7e4f435..407926ea311d9 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ResourceNavigationLinks service client. </summary>
-    public partial class ResourceNavigationLinksClient
+    public partial class ResourceNavigationLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceNavigationLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceNavigationLinksClient for mocking. </summary>
-        protected ResourceNavigationLinksClient()
+        internal ResourceNavigationLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceNavigationLinksOperations for mocking. </summary>
+        protected ResourceNavigationLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceNavigationLinksClient. </summary>
+        /// <summary> Initializes a new instance of ResourceNavigationLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourceNavigationLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourceNavigationLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourceNavigationLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourceNavigationLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ResourceNavigationLinksClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceNavigationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksOperations.List");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ResourceNavigationLinksListResult>> ListAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceNavigationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksOperations.List");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksRestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksRestOperations.cs
index 4031a9d88e46d..8a69d14735216 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ResourceNavigationLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ResourceNavigationLinksRestClient
+    internal partial class ResourceNavigationLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceNavigationLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceNavigationLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceNavigationLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourceNavigationLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/OperationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/OperationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RestOperations.cs
index 59e4691d36526..55ff305ce2505 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/OperationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesOperations.cs
index 907eae83b0895..2f372f6bc5579 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The RouteFilterRules service client. </summary>
-    public partial class RouteFilterRulesClient
+    public partial class RouteFilterRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RouteFilterRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RouteFilterRulesClient for mocking. </summary>
-        protected RouteFilterRulesClient()
+        internal RouteFilterRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RouteFilterRulesOperations for mocking. </summary>
+        protected RouteFilterRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of RouteFilterRulesClient. </summary>
+        /// <summary> Initializes a new instance of RouteFilterRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RouteFilterRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RouteFilterRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RouteFilterRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RouteFilterRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RouteFilterRulesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteFilterRule>> GetAsync(string resourceGroupName, string routeFilterName, string ruleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<RouteFilterRule>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteFilterRule> Get(string resourceGroupName, string routeFilterName, string ruleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<RouteFilterRule> ListByRouteFilterAsync(string reso
 
             async Task<Page<RouteFilterRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<RouteFilterRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteFilterRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<RouteFilterRule> ListByRouteFilter(string resourceGroupN
 
             Page<RouteFilterRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<RouteFilterRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteFilterRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<RouteFilterRulesDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(ruleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual RouteFilterRulesDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(ruleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<RouteFilterRulesCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(routeFilterRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual RouteFilterRulesCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(routeFilterRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesRestOperations.cs
index 025f7b0cb4f65..51ba4dbdc7a82 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFilterRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class RouteFilterRulesRestClient
+    internal partial class RouteFilterRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RouteFilterRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of RouteFilterRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RouteFilterRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RouteFilterRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersOperations.cs
index 92b5f6ca63620..e6c20a7d1e92a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The RouteFilters service client. </summary>
-    public partial class RouteFiltersClient
+    public partial class RouteFiltersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RouteFiltersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RouteFiltersClient for mocking. </summary>
-        protected RouteFiltersClient()
+        internal RouteFiltersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RouteFiltersOperations for mocking. </summary>
+        protected RouteFiltersOperations()
         {
         }
-        /// <summary> Initializes a new instance of RouteFiltersClient. </summary>
+        /// <summary> Initializes a new instance of RouteFiltersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RouteFiltersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RouteFiltersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RouteFiltersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RouteFiltersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RouteFiltersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteFilter>> GetAsync(string resourceGroupName, string routeFilterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<RouteFilter>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteFilter> Get(string resourceGroupName, string routeFilterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<RouteFilter> Get(string resourceGroupName, string routeF
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteFilter>> UpdateTagsAsync(string resourceGroupName, string routeFilterName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<RouteFilter>> UpdateTagsAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteFilter> UpdateTags(string resourceGroupName, string routeFilterName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<RouteFilter> ListByResourceGroupAsync(string resour
 
             async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteFilter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<RouteFilter> ListByResourceGroup(string resourceGroupNam
 
             Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteFilter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<RouteFilter> ListAsync(CancellationToken cancellati
         {
             async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteFilter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<RouteFilter> List(CancellationToken cancellationToken =
         {
             Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteFilter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<RouteFiltersDeleteOperation> StartDeleteAsync(string r
                 throw new ArgumentNullException(nameof(routeFilterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual RouteFiltersDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(routeFilterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<RouteFiltersCreateOrUpdateOperation> StartCreateOrUpda
                 throw new ArgumentNullException(nameof(routeFilterParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual RouteFiltersCreateOrUpdateOperation StartCreateOrUpdate(string re
                 throw new ArgumentNullException(nameof(routeFilterParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersRestOperations.cs
index dd5180be7b788..4e2f40a3c48d1 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteFiltersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class RouteFiltersRestClient
+    internal partial class RouteFiltersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RouteFiltersRestClient. </summary>
+        /// <summary> Initializes a new instance of RouteFiltersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RouteFiltersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RouteFiltersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesOperations.cs
index 95a98ba861bb0..3a14ef2e9b158 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The RouteTables service client. </summary>
-    public partial class RouteTablesClient
+    public partial class RouteTablesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RouteTablesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RouteTablesClient for mocking. </summary>
-        protected RouteTablesClient()
+        internal RouteTablesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RouteTablesOperations for mocking. </summary>
+        protected RouteTablesOperations()
         {
         }
-        /// <summary> Initializes a new instance of RouteTablesClient. </summary>
+        /// <summary> Initializes a new instance of RouteTablesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RouteTablesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RouteTablesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RouteTablesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteTable>> GetAsync(string resourceGroupName, string routeTableName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<RouteTable>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteTable> Get(string resourceGroupName, string routeTableName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<RouteTable> Get(string resourceGroupName, string routeTa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteTable>> UpdateTagsAsync(string resourceGroupName, string routeTableName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<RouteTable>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteTable> UpdateTags(string resourceGroupName, string routeTableName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<RouteTable> ListAsync(string resourceGroupName, Can
 
             async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteTable>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<RouteTable> List(string resourceGroupName, CancellationT
 
             Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteTable> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<RouteTable> ListAllAsync(CancellationToken cancella
         {
             async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteTable>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<RouteTable> ListAll(CancellationToken cancellationToken
         {
             Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteTable> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<RouteTablesDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual RouteTablesDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<RouteTablesCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual RouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesRestOperations.cs
index 5ddfe947af88c..e3b130d01759e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RouteTablesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class RouteTablesRestClient
+    internal partial class RouteTablesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RouteTablesRestClient. </summary>
+        /// <summary> Initializes a new instance of RouteTablesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RouteTablesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RouteTablesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesOperations.cs
index 104783f44d388..6d466deadad8d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The Routes service client. </summary>
-    public partial class RoutesClient
+    public partial class RoutesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RoutesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RoutesClient for mocking. </summary>
-        protected RoutesClient()
+        internal RoutesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RoutesOperations for mocking. </summary>
+        protected RoutesOperations()
         {
         }
-        /// <summary> Initializes a new instance of RoutesClient. </summary>
+        /// <summary> Initializes a new instance of RoutesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RoutesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RoutesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RoutesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RoutesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RoutesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Route>> GetAsync(string resourceGroupName, string routeTableName, string routeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<Route>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Route> Get(string resourceGroupName, string routeTableName, string routeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<Route> ListAsync(string resourceGroupName, string r
 
             async Task<Page<Route>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<Route>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Route>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<Route> List(string resourceGroupName, string routeTableN
 
             Page<Route> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<Route> FirstPageFunc(int? pageSizeHint)
             }
             Page<Route> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<RoutesDeleteOperation> StartDeleteAsync(string resourc
                 throw new ArgumentNullException(nameof(routeName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual RoutesDeleteOperation StartDelete(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(routeName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<RoutesCreateOrUpdateOperation> StartCreateOrUpdateAsyn
                 throw new ArgumentNullException(nameof(routeParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual RoutesCreateOrUpdateOperation StartCreateOrUpdate(string resource
                 throw new ArgumentNullException(nameof(routeParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesRestOperations.cs
index 80275ffdd97b1..95cbf5f5c2ae0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/RoutesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class RoutesRestClient
+    internal partial class RoutesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RoutesRestClient. </summary>
+        /// <summary> Initializes a new instance of RoutesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RoutesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RoutesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersOperations.cs
index 41578b08ebe38..142992dac11be 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The SecurityPartnerProviders service client. </summary>
-    public partial class SecurityPartnerProvidersClient
+    public partial class SecurityPartnerProvidersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SecurityPartnerProvidersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SecurityPartnerProvidersClient for mocking. </summary>
-        protected SecurityPartnerProvidersClient()
+        internal SecurityPartnerProvidersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SecurityPartnerProvidersOperations for mocking. </summary>
+        protected SecurityPartnerProvidersOperations()
         {
         }
-        /// <summary> Initializes a new instance of SecurityPartnerProvidersClient. </summary>
+        /// <summary> Initializes a new instance of SecurityPartnerProvidersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SecurityPartnerProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SecurityPartnerProvidersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SecurityPartnerProvidersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SecurityPartnerProvidersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal SecurityPartnerProvidersClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityPartnerProvider>> GetAsync(string resourceGroupName, string securityPartnerProviderName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<SecurityPartnerProvider>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityPartnerProvider> Get(string resourceGroupName, string securityPartnerProviderName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<SecurityPartnerProvider> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityPartnerProvider>> UpdateTagsAsync(string resourceGroupName, string securityPartnerProviderName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<SecurityPartnerProvider>> UpdateTagsAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityPartnerProvider> UpdateTags(string resourceGroupName, string securityPartnerProviderName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<SecurityPartnerProvider> ListByResourceGroupAsync(s
 
             async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityPartnerProvider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<SecurityPartnerProvider> ListByResourceGroup(string reso
 
             Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityPartnerProvider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<SecurityPartnerProvider> ListAsync(CancellationToke
         {
             async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityPartnerProvider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<SecurityPartnerProvider> List(CancellationToken cancella
         {
             Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityPartnerProvider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<SecurityPartnerProvidersDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(securityPartnerProviderName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual SecurityPartnerProvidersDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(securityPartnerProviderName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<SecurityPartnerProvidersCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual SecurityPartnerProvidersCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersRestOperations.cs
index 85653b5daf210..a4d3820f73671 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityPartnerProvidersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class SecurityPartnerProvidersRestClient
+    internal partial class SecurityPartnerProvidersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SecurityPartnerProvidersRestClient. </summary>
+        /// <summary> Initializes a new instance of SecurityPartnerProvidersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SecurityPartnerProvidersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SecurityPartnerProvidersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesOperations.cs
index 81ec2b8a8c3e3..5d8327dbfd3e0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The SecurityRules service client. </summary>
-    public partial class SecurityRulesClient
+    public partial class SecurityRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SecurityRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SecurityRulesClient for mocking. </summary>
-        protected SecurityRulesClient()
+        internal SecurityRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SecurityRulesOperations for mocking. </summary>
+        protected SecurityRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of SecurityRulesClient. </summary>
+        /// <summary> Initializes a new instance of SecurityRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SecurityRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SecurityRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SecurityRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal SecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<SecurityRule> ListAsync(string resourceGroupName, s
 
             async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<SecurityRule> List(string resourceGroupName, string netw
 
             Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<SecurityRulesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(securityRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual SecurityRulesDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(securityRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<SecurityRulesCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(securityRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual SecurityRulesCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(securityRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesRestOperations.cs
index a55aa41cfb4b4..990206f570827 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/SecurityRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class SecurityRulesRestClient
+    internal partial class SecurityRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SecurityRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of SecurityRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SecurityRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SecurityRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksOperations.cs
similarity index 84%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksOperations.cs
index 9d15e13ffec60..45f0b4c66bcbd 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ServiceAssociationLinks service client. </summary>
-    public partial class ServiceAssociationLinksClient
+    public partial class ServiceAssociationLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceAssociationLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceAssociationLinksClient for mocking. </summary>
-        protected ServiceAssociationLinksClient()
+        internal ServiceAssociationLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceAssociationLinksOperations for mocking. </summary>
+        protected ServiceAssociationLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceAssociationLinksClient. </summary>
+        /// <summary> Initializes a new instance of ServiceAssociationLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceAssociationLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceAssociationLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceAssociationLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceAssociationLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ServiceAssociationLinksClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceAssociationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksOperations.List");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ServiceAssociationLinksListResult>> ListAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceAssociationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksOperations.List");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksRestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksRestOperations.cs
index ecb3dfbe20a69..f386fde09958d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceAssociationLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ServiceAssociationLinksRestClient
+    internal partial class ServiceAssociationLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceAssociationLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceAssociationLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceAssociationLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceAssociationLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesOperations.cs
index 7715cab0c84e0..c83be68023a9a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ServiceEndpointPolicies service client. </summary>
-    public partial class ServiceEndpointPoliciesClient
+    public partial class ServiceEndpointPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceEndpointPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceEndpointPoliciesClient for mocking. </summary>
-        protected ServiceEndpointPoliciesClient()
+        internal ServiceEndpointPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceEndpointPoliciesOperations for mocking. </summary>
+        protected ServiceEndpointPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceEndpointPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceEndpointPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceEndpointPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceEndpointPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceEndpointPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ServiceEndpointPoliciesClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceEndpointPolicy>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ServiceEndpointPolicy>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceEndpointPolicy> Get(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<ServiceEndpointPolicy> Get(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceEndpointPolicy>> UpdateTagsAsync(string resourceGroupName, string serviceEndpointPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<ServiceEndpointPolicy>> UpdateTagsAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceEndpointPolicy> UpdateTags(string resourceGroupName, string serviceEndpointPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<ServiceEndpointPolicy> ListAsync(CancellationToken
         {
             async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ServiceEndpointPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<ServiceEndpointPolicy> List(CancellationToken cancellati
         {
             Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServiceEndpointPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<ServiceEndpointPolicy> ListByResourceGroupAsync(str
 
             async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ServiceEndpointPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<ServiceEndpointPolicy> ListByResourceGroup(string resour
 
             Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServiceEndpointPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<ServiceEndpointPoliciesDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual ServiceEndpointPoliciesDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<ServiceEndpointPoliciesCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual ServiceEndpointPoliciesCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesRestOperations.cs
index c9b02b9a01029..523c529db996b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ServiceEndpointPoliciesRestClient
+    internal partial class ServiceEndpointPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceEndpointPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceEndpointPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceEndpointPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsOperations.cs
index 7a2171f97726a..94b4e99e6030f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ServiceEndpointPolicyDefinitions service client. </summary>
-    public partial class ServiceEndpointPolicyDefinitionsClient
+    public partial class ServiceEndpointPolicyDefinitionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceEndpointPolicyDefinitionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsClient for mocking. </summary>
-        protected ServiceEndpointPolicyDefinitionsClient()
+        internal ServiceEndpointPolicyDefinitionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsOperations for mocking. </summary>
+        protected ServiceEndpointPolicyDefinitionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceEndpointPolicyDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceEndpointPolicyDefinitionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceEndpointPolicyDefinitionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceEndpointPolicyDefinitionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ServiceEndpointPolicyDefinitionsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceEndpointPolicyDefinition>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ServiceEndpointPolicyDefinition>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceEndpointPolicyDefinition> Get(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ServiceEndpointPolicyDefinition> ListByResourceGrou
 
             async Task<Page<ServiceEndpointPolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ServiceEndpointPolicyDefinition>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<ServiceEndpointPolicyDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ServiceEndpointPolicyDefinition> ListByResourceGroup(str
 
             Page<ServiceEndpointPolicyDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ServiceEndpointPolicyDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServiceEndpointPolicyDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ServiceEndpointPolicyDefinitionsDeleteOperation> Start
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ServiceEndpointPolicyDefinitionsDeleteOperation StartDelete(strin
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ServiceEndpointPolicyDefinitionsCreateOrUpdateOperatio
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitions));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation StartCrea
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitions));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsRestOperations.cs
index dffa9dcc7c956..f387280969357 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceEndpointPolicyDefinitionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ServiceEndpointPolicyDefinitionsRestClient
+    internal partial class ServiceEndpointPolicyDefinitionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceEndpointPolicyDefinitionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceEndpointPolicyDefinitionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceOperations.cs
index ea78b713385c3..871f31e076ddb 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The Service service client. </summary>
-    public partial class ServiceClient
+    public partial class ServiceOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceClient for mocking. </summary>
-        protected ServiceClient()
+        internal ServiceRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceOperations for mocking. </summary>
+        protected ServiceOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceClient. </summary>
+        /// <summary> Initializes a new instance of ServiceOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ServiceClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DnsNameAvailabilityResult>> CheckDnsNameAvailabilityAsync(string location, string domainNameLabel, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.CheckDnsNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.CheckDnsNameAvailability");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<DnsNameAvailabilityResult>> CheckDnsNameAvail
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DnsNameAvailabilityResult> CheckDnsNameAvailability(string location, string domainNameLabel, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.CheckDnsNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.CheckDnsNameAvailability");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<DnsNameAvailabilityResult> CheckDnsNameAvailability(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualWanSecurityProviders>> SupportedSecurityProvidersAsync(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.SupportedSecurityProviders");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.SupportedSecurityProviders");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<VirtualWanSecurityProviders>> SupportedSecuri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualWanSecurityProviders> SupportedSecurityProviders(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.SupportedSecurityProviders");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.SupportedSecurityProviders");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual AsyncPageable<BastionShareableLink> GetBastionShareableLinkAsync(
 
             async Task<Page<BastionShareableLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -150,7 +150,7 @@ async Task<Page<BastionShareableLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionShareableLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -188,7 +188,7 @@ public virtual Pageable<BastionShareableLink> GetBastionShareableLink(string res
 
             Page<BastionShareableLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ Page<BastionShareableLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionShareableLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -241,7 +241,7 @@ public virtual AsyncPageable<BastionSessionState> DisconnectActiveSessionsAsync(
 
             async Task<Page<BastionSessionState>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -256,7 +256,7 @@ async Task<Page<BastionSessionState>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionSessionState>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -294,7 +294,7 @@ public virtual Pageable<BastionSessionState> DisconnectActiveSessions(string res
 
             Page<BastionSessionState> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -309,7 +309,7 @@ Page<BastionSessionState> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionSessionState> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -345,7 +345,7 @@ public virtual async Task<ServicePutBastionShareableLinkOperation> StartPutBasti
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartPutBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartPutBastionShareableLink");
             scope.Start();
             try
             {
@@ -379,7 +379,7 @@ public virtual ServicePutBastionShareableLinkOperation StartPutBastionShareableL
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartPutBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartPutBastionShareableLink");
             scope.Start();
             try
             {
@@ -413,7 +413,7 @@ public virtual async Task<ServiceDeleteBastionShareableLinkOperation> StartDelet
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartDeleteBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartDeleteBastionShareableLink");
             scope.Start();
             try
             {
@@ -447,7 +447,7 @@ public virtual ServiceDeleteBastionShareableLinkOperation StartDeleteBastionShar
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartDeleteBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartDeleteBastionShareableLink");
             scope.Start();
             try
             {
@@ -476,7 +476,7 @@ public virtual async Task<ServiceGetActiveSessionsOperation> StartGetActiveSessi
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGetActiveSessions");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGetActiveSessions");
             scope.Start();
             try
             {
@@ -505,7 +505,7 @@ public virtual ServiceGetActiveSessionsOperation StartGetActiveSessions(string r
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGetActiveSessions");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGetActiveSessions");
             scope.Start();
             try
             {
@@ -539,7 +539,7 @@ public virtual async Task<ServiceGeneratevirtualwanvpnserverconfigurationvpnprof
                 throw new ArgumentNullException(nameof(vpnClientParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
             scope.Start();
             try
             {
@@ -573,7 +573,7 @@ public virtual ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperatio
                 throw new ArgumentNullException(nameof(vpnClientParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceRestOperations.cs
index ea9d3d82dd16c..41314829402b9 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ServiceRestClient
+    internal partial class ServiceRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsOperations.cs
similarity index 82%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsOperations.cs
index f7ac1265df698..e929273d3b79d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The ServiceTags service client. </summary>
-    public partial class ServiceTagsClient
+    public partial class ServiceTagsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceTagsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceTagsClient for mocking. </summary>
-        protected ServiceTagsClient()
+        internal ServiceTagsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceTagsOperations for mocking. </summary>
+        protected ServiceTagsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceTagsClient. </summary>
+        /// <summary> Initializes a new instance of ServiceTagsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceTagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceTagsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceTagsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceTagsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -41,7 +41,7 @@ internal ServiceTagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceTagsListResult>> ListAsync(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceTagsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceTagsOperations.List");
             scope.Start();
             try
             {
@@ -59,7 +59,7 @@ public virtual async Task<Response<ServiceTagsListResult>> ListAsync(string loca
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceTagsListResult> List(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceTagsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceTagsOperations.List");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsRestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsRestOperations.cs
index 6ed7fc5eb45b0..50d8bac6ed31e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/ServiceTagsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class ServiceTagsRestClient
+    internal partial class ServiceTagsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceTagsRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceTagsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceTagsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceTagsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsOperations.cs
index 023089a5dbcff..a26bb383bc056 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The Subnets service client. </summary>
-    public partial class SubnetsClient
+    public partial class SubnetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SubnetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SubnetsClient for mocking. </summary>
-        protected SubnetsClient()
+        internal SubnetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SubnetsOperations for mocking. </summary>
+        protected SubnetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of SubnetsClient. </summary>
+        /// <summary> Initializes a new instance of SubnetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SubnetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SubnetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SubnetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SubnetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal SubnetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Subnet>> GetAsync(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<Subnet>> GetAsync(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Subnet> Get(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<Subnet> ListAsync(string resourceGroupName, string
 
             async Task<Page<Subnet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<Subnet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Subnet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ public virtual Pageable<Subnet> List(string resourceGroupName, string virtualNet
 
             Page<Subnet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -159,7 +159,7 @@ Page<Subnet> FirstPageFunc(int? pageSizeHint)
             }
             Page<Subnet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -195,7 +195,7 @@ public virtual async Task<SubnetsDeleteOperation> StartDeleteAsync(string resour
                 throw new ArgumentNullException(nameof(subnetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual SubnetsDeleteOperation StartDelete(string resourceGroupName, stri
                 throw new ArgumentNullException(nameof(subnetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -268,7 +268,7 @@ public virtual async Task<SubnetsCreateOrUpdateOperation> StartCreateOrUpdateAsy
                 throw new ArgumentNullException(nameof(subnetParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -307,7 +307,7 @@ public virtual SubnetsCreateOrUpdateOperation StartCreateOrUpdate(string resourc
                 throw new ArgumentNullException(nameof(subnetParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -346,7 +346,7 @@ public virtual async Task<SubnetsPrepareNetworkPoliciesOperation> StartPrepareNe
                 throw new ArgumentNullException(nameof(prepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartPrepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartPrepareNetworkPolicies");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual SubnetsPrepareNetworkPoliciesOperation StartPrepareNetworkPolicie
                 throw new ArgumentNullException(nameof(prepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartPrepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartPrepareNetworkPolicies");
             scope.Start();
             try
             {
@@ -424,7 +424,7 @@ public virtual async Task<SubnetsUnprepareNetworkPoliciesOperation> StartUnprepa
                 throw new ArgumentNullException(nameof(unprepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartUnprepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartUnprepareNetworkPolicies");
             scope.Start();
             try
             {
@@ -463,7 +463,7 @@ public virtual SubnetsUnprepareNetworkPoliciesOperation StartUnprepareNetworkPol
                 throw new ArgumentNullException(nameof(unprepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartUnprepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartUnprepareNetworkPolicies");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsRestOperations.cs
index 091c5219e3c29..f0048c538bea0 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/SubnetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class SubnetsRestClient
+    internal partial class SubnetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SubnetsRestClient. </summary>
+        /// <summary> Initializes a new instance of SubnetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SubnetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SubnetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesOperations.cs
similarity index 87%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesOperations.cs
index bbb7b00ccb526..689e22d7c79ad 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The Usages service client. </summary>
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsagesClient for mocking. </summary>
-        protected UsagesClient()
+        internal UsagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsagesOperations for mocking. </summary>
+        protected UsagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsagesClient. </summary>
+        /// <summary> Initializes a new instance of UsagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal UsagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal UsagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new UsagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new UsagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<Usage> ListAsync(string location, CancellationToken
 
             async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Usage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<Usage> List(string location, CancellationToken cancellat
 
             Page<Usage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<Usage> FirstPageFunc(int? pageSizeHint)
             }
             Page<Usage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesRestOperations.cs
similarity index 97%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesRestOperations.cs
index ad50bfd9a59d3..e36e72833e2ad 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/UsagesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class UsagesRestClient
+    internal partial class UsagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsagesRestClient. </summary>
+        /// <summary> Initializes a new instance of UsagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public UsagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SOperations.cs
index 1b6c9ae323028..de93717467314 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualHubRouteTableV2S service client. </summary>
-    public partial class VirtualHubRouteTableV2SClient
+    public partial class VirtualHubRouteTableV2SOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualHubRouteTableV2SRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SClient for mocking. </summary>
-        protected VirtualHubRouteTableV2SClient()
+        internal VirtualHubRouteTableV2SRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SOperations for mocking. </summary>
+        protected VirtualHubRouteTableV2SOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualHubRouteTableV2SClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualHubRouteTableV2SOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualHubRouteTableV2SRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualHubRouteTableV2SRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualHubRouteTableV2SClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualHubRouteTableV2>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualHubRouteTableV2>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualHubRouteTableV2> Get(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VirtualHubRouteTableV2> ListAsync(string resourceGr
 
             async Task<Page<VirtualHubRouteTableV2>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VirtualHubRouteTableV2>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualHubRouteTableV2>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VirtualHubRouteTableV2> List(string resourceGroupName, s
 
             Page<VirtualHubRouteTableV2> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VirtualHubRouteTableV2> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualHubRouteTableV2> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<VirtualHubRouteTableV2SCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(virtualHubRouteTableV2Parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual VirtualHubRouteTableV2SCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(virtualHubRouteTableV2Parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<VirtualHubRouteTableV2SDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VirtualHubRouteTableV2SDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SRestOperations.cs
index 5cd977a9bd79d..c89eb45a7c18f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubRouteTableV2SRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualHubRouteTableV2SRestClient
+    internal partial class VirtualHubRouteTableV2SRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualHubRouteTableV2SRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualHubRouteTableV2SRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsOperations.cs
index 987d350a55ffc..e20d97e08ea3f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualHubs service client. </summary>
-    public partial class VirtualHubsClient
+    public partial class VirtualHubsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualHubsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualHubsClient for mocking. </summary>
-        protected VirtualHubsClient()
+        internal VirtualHubsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualHubsOperations for mocking. </summary>
+        protected VirtualHubsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualHubsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualHubsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualHubsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualHubsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualHubsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualHubsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualHub>> GetAsync(string resourceGroupName, string virtualHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualHub>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualHub> Get(string resourceGroupName, string virtualHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VirtualHub> Get(string resourceGroupName, string virtual
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualHub>> UpdateTagsAsync(string resourceGroupName, string virtualHubName, TagsObject virtualHubParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VirtualHub>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualHub> UpdateTags(string resourceGroupName, string virtualHubName, TagsObject virtualHubParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VirtualHub> ListByResourceGroupAsync(string resourc
 
             async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualHub>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VirtualHub> ListByResourceGroup(string resourceGroupName
 
             Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualHub> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VirtualHub> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualHub>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualHub> List(CancellationToken cancellationToken = d
         {
             Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualHub> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VirtualHubsCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(virtualHubParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VirtualHubsCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(virtualHubParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VirtualHubsDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(virtualHubName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VirtualHubsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(virtualHubName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsRestOperations.cs
index 612fb3f3677ac..93ced7d250a18 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualHubsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualHubsRestClient
+    internal partial class VirtualHubsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualHubsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualHubsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualHubsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsOperations.cs
index 51a7c3363c1bf..d08f36f43e667 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualNetworkGatewayConnections service client. </summary>
-    public partial class VirtualNetworkGatewayConnectionsClient
+    public partial class VirtualNetworkGatewayConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkGatewayConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsClient for mocking. </summary>
-        protected VirtualNetworkGatewayConnectionsClient()
+        internal VirtualNetworkGatewayConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsOperations for mocking. </summary>
+        protected VirtualNetworkGatewayConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkGatewayConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkGatewayConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkGatewayConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkGatewayConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualNetworkGatewayConnectionsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkGatewayConnection>> GetAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualNetworkGatewayConnection>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkGatewayConnection> Get(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualNetworkGatewayConnection> Get(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConnectionSharedKey>> GetSharedKeyAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.GetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.GetSharedKey");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<ConnectionSharedKey>> GetSharedKeyAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConnectionSharedKey> GetSharedKey(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.GetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.GetSharedKey");
             scope.Start();
             try
             {
@@ -125,7 +125,7 @@ public virtual AsyncPageable<VirtualNetworkGatewayConnection> ListAsync(string r
 
             async Task<Page<VirtualNetworkGatewayConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -140,7 +140,7 @@ async Task<Page<VirtualNetworkGatewayConnection>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<VirtualNetworkGatewayConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -168,7 +168,7 @@ public virtual Pageable<VirtualNetworkGatewayConnection> List(string resourceGro
 
             Page<VirtualNetworkGatewayConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -183,7 +183,7 @@ Page<VirtualNetworkGatewayConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkGatewayConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsCreateOrUpdateOperatio
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -253,7 +253,7 @@ public virtual VirtualNetworkGatewayConnectionsCreateOrUpdateOperation StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -282,7 +282,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsDeleteOperation> Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -311,7 +311,7 @@ public virtual VirtualNetworkGatewayConnectionsDeleteOperation StartDelete(strin
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -345,7 +345,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsUpdateTagsOperation> S
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -379,7 +379,7 @@ public virtual VirtualNetworkGatewayConnectionsUpdateTagsOperation StartUpdateTa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -413,7 +413,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsSetSharedKeyOperation>
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartSetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartSetSharedKey");
             scope.Start();
             try
             {
@@ -447,7 +447,7 @@ public virtual VirtualNetworkGatewayConnectionsSetSharedKeyOperation StartSetSha
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartSetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartSetSharedKey");
             scope.Start();
             try
             {
@@ -481,7 +481,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsResetSharedKeyOperatio
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartResetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartResetSharedKey");
             scope.Start();
             try
             {
@@ -515,7 +515,7 @@ public virtual VirtualNetworkGatewayConnectionsResetSharedKeyOperation StartRese
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartResetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartResetSharedKey");
             scope.Start();
             try
             {
@@ -545,7 +545,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsStartPacketCaptureOper
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -575,7 +575,7 @@ public virtual VirtualNetworkGatewayConnectionsStartPacketCaptureOperation Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -609,7 +609,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsStopPacketCaptureOpera
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
@@ -643,7 +643,7 @@ public virtual VirtualNetworkGatewayConnectionsStopPacketCaptureOperation StartS
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsRestOperations.cs
index 183ed5875bdbb..db8e9e8418b14 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewayConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualNetworkGatewayConnectionsRestClient
+    internal partial class VirtualNetworkGatewayConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkGatewayConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkGatewayConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysOperations.cs
index 1c285155c4809..70c3977580c00 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualNetworkGateways service client. </summary>
-    public partial class VirtualNetworkGatewaysClient
+    public partial class VirtualNetworkGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewaysClient for mocking. </summary>
-        protected VirtualNetworkGatewaysClient()
+        internal VirtualNetworkGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkGatewaysOperations for mocking. </summary>
+        protected VirtualNetworkGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkGateway>> GetAsync(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualNetworkGateway>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkGateway> Get(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualNetworkGateway> Get(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<string>> SupportedVpnDevicesAsync(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.SupportedVpnDevices");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.SupportedVpnDevices");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<string>> SupportedVpnDevicesAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<string> SupportedVpnDevices(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.SupportedVpnDevices");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.SupportedVpnDevices");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<string> SupportedVpnDevices(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<string>> VpnDeviceConfigurationScriptAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.VpnDeviceConfigurationScript");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.VpnDeviceConfigurationScript");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<string>> VpnDeviceConfigurationScriptAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<string> VpnDeviceConfigurationScript(string resourceGroupName, string virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.VpnDeviceConfigurationScript");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.VpnDeviceConfigurationScript");
             scope.Start();
             try
             {
@@ -165,7 +165,7 @@ public virtual AsyncPageable<VirtualNetworkGateway> ListAsync(string resourceGro
 
             async Task<Page<VirtualNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -180,7 +180,7 @@ async Task<Page<VirtualNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -208,7 +208,7 @@ public virtual Pageable<VirtualNetworkGateway> List(string resourceGroupName, Ca
 
             Page<VirtualNetworkGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -223,7 +223,7 @@ Page<VirtualNetworkGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -256,7 +256,7 @@ public virtual AsyncPageable<VirtualNetworkGatewayConnectionListEntity> ListConn
 
             async Task<Page<VirtualNetworkGatewayConnectionListEntity>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -271,7 +271,7 @@ async Task<Page<VirtualNetworkGatewayConnectionListEntity>> FirstPageFunc(int? p
             }
             async Task<Page<VirtualNetworkGatewayConnectionListEntity>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -304,7 +304,7 @@ public virtual Pageable<VirtualNetworkGatewayConnectionListEntity> ListConnectio
 
             Page<VirtualNetworkGatewayConnectionListEntity> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -319,7 +319,7 @@ Page<VirtualNetworkGatewayConnectionListEntity> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkGatewayConnectionListEntity> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -355,7 +355,7 @@ public virtual async Task<VirtualNetworkGatewaysCreateOrUpdateOperation> StartCr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual VirtualNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -418,7 +418,7 @@ public virtual async Task<VirtualNetworkGatewaysDeleteOperation> StartDeleteAsyn
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -447,7 +447,7 @@ public virtual VirtualNetworkGatewaysDeleteOperation StartDelete(string resource
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -481,7 +481,7 @@ public virtual async Task<VirtualNetworkGatewaysUpdateTagsOperation> StartUpdate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -515,7 +515,7 @@ public virtual VirtualNetworkGatewaysUpdateTagsOperation StartUpdateTags(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -545,7 +545,7 @@ public virtual async Task<VirtualNetworkGatewaysResetOperation> StartResetAsync(
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartReset");
             scope.Start();
             try
             {
@@ -575,7 +575,7 @@ public virtual VirtualNetworkGatewaysResetOperation StartReset(string resourceGr
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartReset");
             scope.Start();
             try
             {
@@ -604,7 +604,7 @@ public virtual async Task<VirtualNetworkGatewaysResetVpnClientSharedKeyOperation
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartResetVpnClientSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartResetVpnClientSharedKey");
             scope.Start();
             try
             {
@@ -633,7 +633,7 @@ public virtual VirtualNetworkGatewaysResetVpnClientSharedKeyOperation StartReset
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartResetVpnClientSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartResetVpnClientSharedKey");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual async Task<VirtualNetworkGatewaysGeneratevpnclientpackageOperatio
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGeneratevpnclientpackage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGeneratevpnclientpackage");
             scope.Start();
             try
             {
@@ -701,7 +701,7 @@ public virtual VirtualNetworkGatewaysGeneratevpnclientpackageOperation StartGene
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGeneratevpnclientpackage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGeneratevpnclientpackage");
             scope.Start();
             try
             {
@@ -735,7 +735,7 @@ public virtual async Task<VirtualNetworkGatewaysGenerateVpnProfileOperation> Sta
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -769,7 +769,7 @@ public virtual VirtualNetworkGatewaysGenerateVpnProfileOperation StartGenerateVp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -798,7 +798,7 @@ public virtual async Task<VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnProfilePackageUrl");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnProfilePackageUrl");
             scope.Start();
             try
             {
@@ -827,7 +827,7 @@ public virtual VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation StartGetVp
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnProfilePackageUrl");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnProfilePackageUrl");
             scope.Start();
             try
             {
@@ -857,7 +857,7 @@ public virtual async Task<VirtualNetworkGatewaysGetBgpPeerStatusOperation> Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetBgpPeerStatus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetBgpPeerStatus");
             scope.Start();
             try
             {
@@ -887,7 +887,7 @@ public virtual VirtualNetworkGatewaysGetBgpPeerStatusOperation StartGetBgpPeerSt
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetBgpPeerStatus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetBgpPeerStatus");
             scope.Start();
             try
             {
@@ -916,7 +916,7 @@ public virtual async Task<VirtualNetworkGatewaysGetLearnedRoutesOperation> Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetLearnedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetLearnedRoutes");
             scope.Start();
             try
             {
@@ -945,7 +945,7 @@ public virtual VirtualNetworkGatewaysGetLearnedRoutesOperation StartGetLearnedRo
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetLearnedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetLearnedRoutes");
             scope.Start();
             try
             {
@@ -979,7 +979,7 @@ public virtual async Task<VirtualNetworkGatewaysGetAdvertisedRoutesOperation> St
                 throw new ArgumentNullException(nameof(peer));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetAdvertisedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetAdvertisedRoutes");
             scope.Start();
             try
             {
@@ -1013,7 +1013,7 @@ public virtual VirtualNetworkGatewaysGetAdvertisedRoutesOperation StartGetAdvert
                 throw new ArgumentNullException(nameof(peer));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetAdvertisedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetAdvertisedRoutes");
             scope.Start();
             try
             {
@@ -1047,7 +1047,7 @@ public virtual async Task<VirtualNetworkGatewaysSetVpnclientIpsecParametersOpera
                 throw new ArgumentNullException(nameof(vpnclientIpsecParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartSetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartSetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1081,7 +1081,7 @@ public virtual VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation StartS
                 throw new ArgumentNullException(nameof(vpnclientIpsecParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartSetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartSetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1110,7 +1110,7 @@ public virtual async Task<VirtualNetworkGatewaysGetVpnclientIpsecParametersOpera
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1139,7 +1139,7 @@ public virtual VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation StartG
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1169,7 +1169,7 @@ public virtual async Task<VirtualNetworkGatewaysStartPacketCaptureOperation> Sta
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -1199,7 +1199,7 @@ public virtual VirtualNetworkGatewaysStartPacketCaptureOperation StartStartPacke
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -1233,7 +1233,7 @@ public virtual async Task<VirtualNetworkGatewaysStopPacketCaptureOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
@@ -1267,7 +1267,7 @@ public virtual VirtualNetworkGatewaysStopPacketCaptureOperation StartStopPacketC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
@@ -1296,7 +1296,7 @@ public virtual async Task<VirtualNetworkGatewaysGetVpnclientConnectionHealthOper
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientConnectionHealth");
             scope.Start();
             try
             {
@@ -1325,7 +1325,7 @@ public virtual VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientConnectionHealth");
             scope.Start();
             try
             {
@@ -1359,7 +1359,7 @@ public virtual async Task<VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayV
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDisconnectVirtualNetworkGatewayVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDisconnectVirtualNetworkGatewayVpnConnections");
             scope.Start();
             try
             {
@@ -1393,7 +1393,7 @@ public virtual VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectio
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDisconnectVirtualNetworkGatewayVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDisconnectVirtualNetworkGatewayVpnConnections");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysRestOperations.cs
index a7928d4b065b1..d281a4feb8ed7 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualNetworkGatewaysRestClient
+    internal partial class VirtualNetworkGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsOperations.cs
index d0291ecb9d0a5..00238d155a58e 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualNetworkPeerings service client. </summary>
-    public partial class VirtualNetworkPeeringsClient
+    public partial class VirtualNetworkPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkPeeringsClient for mocking. </summary>
-        protected VirtualNetworkPeeringsClient()
+        internal VirtualNetworkPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkPeeringsOperations for mocking. </summary>
+        protected VirtualNetworkPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualNetworkPeeringsClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkPeering>> GetAsync(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualNetworkPeering>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkPeering> Get(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VirtualNetworkPeering> ListAsync(string resourceGro
 
             async Task<Page<VirtualNetworkPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VirtualNetworkPeering>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VirtualNetworkPeering> List(string resourceGroupName, st
 
             Page<VirtualNetworkPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VirtualNetworkPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<VirtualNetworkPeeringsDeleteOperation> StartDeleteAsyn
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual VirtualNetworkPeeringsDeleteOperation StartDelete(string resource
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<VirtualNetworkPeeringsCreateOrUpdateOperation> StartCr
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VirtualNetworkPeeringsCreateOrUpdateOperation StartCreateOrUpdate
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsRestOperations.cs
index 54293e179f4e2..83bead4a22983 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualNetworkPeeringsRestClient
+    internal partial class VirtualNetworkPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsOperations.cs
index c4ea812b14608..7f61675a4fad2 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualNetworkTaps service client. </summary>
-    public partial class VirtualNetworkTapsClient
+    public partial class VirtualNetworkTapsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkTapsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkTapsClient for mocking. </summary>
-        protected VirtualNetworkTapsClient()
+        internal VirtualNetworkTapsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkTapsOperations for mocking. </summary>
+        protected VirtualNetworkTapsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkTapsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkTapsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkTapsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkTapsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkTapsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkTapsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualNetworkTapsClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkTap>> GetAsync(string resourceGroupName, string tapName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualNetworkTap>> GetAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkTap> Get(string resourceGroupName, string tapName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VirtualNetworkTap> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkTap>> UpdateTagsAsync(string resourceGroupName, string tapName, TagsObject tapParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VirtualNetworkTap>> UpdateTagsAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkTap> UpdateTags(string resourceGroupName, string tapName, TagsObject tapParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<VirtualNetworkTap> ListAllAsync(CancellationToken c
         {
             async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkTap>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<VirtualNetworkTap> ListAll(CancellationToken cancellatio
         {
             Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkTap> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<VirtualNetworkTap> ListByResourceGroupAsync(string
 
             async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkTap>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualNetworkTap> ListByResourceGroup(string resourceGr
 
             Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkTap> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<VirtualNetworkTapsDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(tapName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual VirtualNetworkTapsDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(tapName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<VirtualNetworkTapsCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VirtualNetworkTapsCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsRestOperations.cs
index aaa0fd07b93e5..fa496a628156d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworkTapsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualNetworkTapsRestClient
+    internal partial class VirtualNetworkTapsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkTapsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkTapsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkTapsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkTapsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksOperations.cs
index 032ef12a03302..ac83c0dc2d394 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualNetworks service client. </summary>
-    public partial class VirtualNetworksClient
+    public partial class VirtualNetworksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworksClient for mocking. </summary>
-        protected VirtualNetworksClient()
+        internal VirtualNetworksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworksOperations for mocking. </summary>
+        protected VirtualNetworksOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworksClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualNetworksClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetwork>> GetAsync(string resourceGroupName, string virtualNetworkName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualNetwork>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetwork> Get(string resourceGroupName, string virtualNetworkName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<VirtualNetwork> Get(string resourceGroupName, string vir
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetwork>> UpdateTagsAsync(string resourceGroupName, string virtualNetworkName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<VirtualNetwork>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetwork> UpdateTags(string resourceGroupName, string virtualNetworkName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -124,7 +124,7 @@ public virtual Response<VirtualNetwork> UpdateTags(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IPAddressAvailabilityResult>> CheckIPAddressAvailabilityAsync(string resourceGroupName, string virtualNetworkName, string ipAddress, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.CheckIPAddressAvailability");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.CheckIPAddressAvailability");
             scope.Start();
             try
             {
@@ -144,7 +144,7 @@ public virtual async Task<Response<IPAddressAvailabilityResult>> CheckIPAddressA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IPAddressAvailabilityResult> CheckIPAddressAvailability(string resourceGroupName, string virtualNetworkName, string ipAddress, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.CheckIPAddressAvailability");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.CheckIPAddressAvailability");
             scope.Start();
             try
             {
@@ -163,7 +163,7 @@ public virtual AsyncPageable<VirtualNetwork> ListAllAsync(CancellationToken canc
         {
             async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -178,7 +178,7 @@ async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetwork>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -200,7 +200,7 @@ public virtual Pageable<VirtualNetwork> ListAll(CancellationToken cancellationTo
         {
             Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetwork> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -243,7 +243,7 @@ public virtual AsyncPageable<VirtualNetwork> ListAsync(string resourceGroupName,
 
             async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -258,7 +258,7 @@ async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetwork>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ public virtual Pageable<VirtualNetwork> List(string resourceGroupName, Cancellat
 
             Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -301,7 +301,7 @@ Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetwork> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -334,7 +334,7 @@ public virtual AsyncPageable<VirtualNetworkUsage> ListUsageAsync(string resource
 
             async Task<Page<VirtualNetworkUsage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -349,7 +349,7 @@ async Task<Page<VirtualNetworkUsage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkUsage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -382,7 +382,7 @@ public virtual Pageable<VirtualNetworkUsage> ListUsage(string resourceGroupName,
 
             Page<VirtualNetworkUsage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -397,7 +397,7 @@ Page<VirtualNetworkUsage> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkUsage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -428,7 +428,7 @@ public virtual async Task<VirtualNetworksDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(virtualNetworkName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -457,7 +457,7 @@ public virtual VirtualNetworksDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(virtualNetworkName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -491,7 +491,7 @@ public virtual async Task<VirtualNetworksCreateOrUpdateOperation> StartCreateOrU
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -525,7 +525,7 @@ public virtual VirtualNetworksCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksRestOperations.cs
index d4aeeb6d91f77..205be776219bd 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualNetworksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualNetworksRestClient
+    internal partial class VirtualNetworksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworksRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsOperations.cs
index f32286f753496..c8b28e1a8bf2a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualRouterPeerings service client. </summary>
-    public partial class VirtualRouterPeeringsClient
+    public partial class VirtualRouterPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualRouterPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualRouterPeeringsClient for mocking. </summary>
-        protected VirtualRouterPeeringsClient()
+        internal VirtualRouterPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualRouterPeeringsOperations for mocking. </summary>
+        protected VirtualRouterPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualRouterPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRouterPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualRouterPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualRouterPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualRouterPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualRouterPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualRouterPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualRouterPeering>> GetAsync(string resourceGroupName, string virtualRouterName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualRouterPeering>> GetAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualRouterPeering> Get(string resourceGroupName, string virtualRouterName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VirtualRouterPeering> ListAsync(string resourceGrou
 
             async Task<Page<VirtualRouterPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VirtualRouterPeering>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualRouterPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VirtualRouterPeering> List(string resourceGroupName, str
 
             Page<VirtualRouterPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VirtualRouterPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualRouterPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<VirtualRouterPeeringsDeleteOperation> StartDeleteAsync
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual VirtualRouterPeeringsDeleteOperation StartDelete(string resourceG
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<VirtualRouterPeeringsCreateOrUpdateOperation> StartCre
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VirtualRouterPeeringsCreateOrUpdateOperation StartCreateOrUpdate(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsRestOperations.cs
index e06eea60fa3c6..6bb550774ce07 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRouterPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualRouterPeeringsRestClient
+    internal partial class VirtualRouterPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualRouterPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRouterPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualRouterPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualRouterPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersOperations.cs
index 47f4f48ee55d6..e4ee0ef2a0114 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualRouters service client. </summary>
-    public partial class VirtualRoutersClient
+    public partial class VirtualRoutersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualRoutersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualRoutersClient for mocking. </summary>
-        protected VirtualRoutersClient()
+        internal VirtualRoutersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualRoutersOperations for mocking. </summary>
+        protected VirtualRoutersOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualRoutersClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRoutersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualRoutersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualRoutersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualRoutersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualRoutersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualRoutersClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualRouter>> GetAsync(string resourceGroupName, string virtualRouterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualRouter>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualRouter> Get(string resourceGroupName, string virtualRouterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<VirtualRouter> ListByResourceGroupAsync(string reso
 
             async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualRouter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<VirtualRouter> ListByResourceGroup(string resourceGroupN
 
             Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualRouter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<VirtualRouter> ListAsync(CancellationToken cancella
         {
             async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualRouter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<VirtualRouter> List(CancellationToken cancellationToken
         {
             Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualRouter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ public virtual async Task<VirtualRoutersDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(virtualRouterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -281,7 +281,7 @@ public virtual VirtualRoutersDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(virtualRouterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual async Task<VirtualRoutersCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual VirtualRoutersCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersRestOperations.cs
index 37919b893fdcb..7eda7b9330bc6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualRoutersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualRoutersRestClient
+    internal partial class VirtualRoutersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualRoutersRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRoutersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualRoutersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualRoutersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansOperations.cs
index 04f74cf35f964..e5a2ac5201918 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VirtualWans service client. </summary>
-    public partial class VirtualWansClient
+    public partial class VirtualWansOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualWansRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualWansClient for mocking. </summary>
-        protected VirtualWansClient()
+        internal VirtualWansRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualWansOperations for mocking. </summary>
+        protected VirtualWansOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualWansClient. </summary>
+        /// <summary> Initializes a new instance of VirtualWansOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualWansClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualWansOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualWansRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualWansRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualWansClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualWAN>> GetAsync(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualWAN>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualWAN> Get(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VirtualWAN> Get(string resourceGroupName, string virtual
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualWAN>> UpdateTagsAsync(string resourceGroupName, string virtualWANName, TagsObject wANParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VirtualWAN>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualWAN> UpdateTags(string resourceGroupName, string virtualWANName, TagsObject wANParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VirtualWAN> ListByResourceGroupAsync(string resourc
 
             async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualWAN>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VirtualWAN> ListByResourceGroup(string resourceGroupName
 
             Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualWAN> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VirtualWAN> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualWAN>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualWAN> List(CancellationToken cancellationToken = d
         {
             Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualWAN> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VirtualWansCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(wANParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VirtualWansCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(wANParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VirtualWansDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VirtualWansDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansRestOperations.cs
index 3f901ece011b2..93482eb04918b 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VirtualWansRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VirtualWansRestClient
+    internal partial class VirtualWansRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualWansRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualWansRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualWansRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualWansRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsOperations.cs
index 712e4492ea501..d0a3df1f8fd75 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnConnections service client. </summary>
-    public partial class VpnConnectionsClient
+    public partial class VpnConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnConnectionsClient for mocking. </summary>
-        protected VpnConnectionsClient()
+        internal VpnConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnConnectionsOperations for mocking. </summary>
+        protected VpnConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VpnConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VpnConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VpnConnection>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnConnection> Get(string resourceGroupName, string gatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VpnConnection> ListByVpnGatewayAsync(string resourc
 
             async Task<Page<VpnConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VpnConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VpnConnection> ListByVpnGateway(string resourceGroupName
 
             Page<VpnConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VpnConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<VpnConnectionsCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(vpnConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual VpnConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(vpnConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<VpnConnectionsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VpnConnectionsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsRestOperations.cs
index b3191a262cb9c..3bd4e07a8ba70 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnConnectionsRestClient
+    internal partial class VpnConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysOperations.cs
index 397d3b488f58c..715dbc137491a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnGateways service client. </summary>
-    public partial class VpnGatewaysClient
+    public partial class VpnGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnGatewaysClient for mocking. </summary>
-        protected VpnGatewaysClient()
+        internal VpnGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnGatewaysOperations for mocking. </summary>
+        protected VpnGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of VpnGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnGateway>> GetAsync(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VpnGateway>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnGateway> Get(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VpnGateway> Get(string resourceGroupName, string gateway
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, TagsObject vpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VpnGateway>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnGateway> UpdateTags(string resourceGroupName, string gatewayName, TagsObject vpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VpnGateway> ListByResourceGroupAsync(string resourc
 
             async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VpnGateway> ListByResourceGroup(string resourceGroupName
 
             Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VpnGateway> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VpnGateway> List(CancellationToken cancellationToken = d
         {
             Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VpnGatewaysCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(vpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(vpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VpnGatewaysDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VpnGatewaysDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -416,7 +416,7 @@ public virtual async Task<VpnGatewaysResetOperation> StartResetAsync(string reso
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartReset");
             scope.Start();
             try
             {
@@ -445,7 +445,7 @@ public virtual VpnGatewaysResetOperation StartReset(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartReset");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysRestOperations.cs
index e9a7c22ccc227..28157c500671f 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnGatewaysRestClient
+    internal partial class VpnGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsOperations.cs
similarity index 89%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsOperations.cs
index 3a1651c71f5f8..3d0f560a9efba 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnLinkConnections service client. </summary>
-    public partial class VpnLinkConnectionsClient
+    public partial class VpnLinkConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnLinkConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnLinkConnectionsClient for mocking. </summary>
-        protected VpnLinkConnectionsClient()
+        internal VpnLinkConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnLinkConnectionsOperations for mocking. </summary>
+        protected VpnLinkConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnLinkConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VpnLinkConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnLinkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnLinkConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnLinkConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnLinkConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -59,7 +59,7 @@ public virtual AsyncPageable<VpnSiteLinkConnection> ListByVpnConnectionAsync(str
 
             async Task<Page<VpnSiteLinkConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
@@ -74,7 +74,7 @@ async Task<Page<VpnSiteLinkConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSiteLinkConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
@@ -112,7 +112,7 @@ public virtual Pageable<VpnSiteLinkConnection> ListByVpnConnection(string resour
 
             Page<VpnSiteLinkConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
@@ -127,7 +127,7 @@ Page<VpnSiteLinkConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSiteLinkConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsRestOperations.cs
index 5bfc1e31140ab..4c06891ce39fa 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnLinkConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnLinkConnectionsRestClient
+    internal partial class VpnLinkConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnLinkConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnLinkConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnLinkConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnLinkConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs
similarity index 89%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs
index dbddafc804a92..ac82249832d72 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs
@@ -13,23 +13,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnServerConfigurationsAssociatedWithVirtualWan service client. </summary>
-    public partial class VpnServerConfigurationsAssociatedWithVirtualWanClient
+    public partial class VpnServerConfigurationsAssociatedWithVirtualWanOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnServerConfigurationsAssociatedWithVirtualWanRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanClient for mocking. </summary>
-        protected VpnServerConfigurationsAssociatedWithVirtualWanClient()
+        internal VpnServerConfigurationsAssociatedWithVirtualWanRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanOperations for mocking. </summary>
+        protected VpnServerConfigurationsAssociatedWithVirtualWanOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnServerConfigurationsAssociatedWithVirtualWanClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnServerConfigurationsAssociatedWithVirtualWanOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnServerConfigurationsAssociatedWithVirtualWanRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnServerConfigurationsAssociatedWithVirtualWanRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual async Task<VpnServerConfigurationsAssociatedWithVirtualWanListOpe
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanClient.StartList");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanOperations.StartList");
             scope.Start();
             try
             {
@@ -78,7 +78,7 @@ public virtual VpnServerConfigurationsAssociatedWithVirtualWanListOperation Star
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanClient.StartList");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanOperations.StartList");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs
index bc155a959500a..0a532ff73fbcd 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs
@@ -14,20 +14,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnServerConfigurationsAssociatedWithVirtualWanRestClient
+    internal partial class VpnServerConfigurationsAssociatedWithVirtualWanRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnServerConfigurationsAssociatedWithVirtualWanRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnServerConfigurationsAssociatedWithVirtualWanRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsOperations.cs
similarity index 93%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsOperations.cs
index 9d52fd722c52b..29c6ceed481d7 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnServerConfigurations service client. </summary>
-    public partial class VpnServerConfigurationsClient
+    public partial class VpnServerConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnServerConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsClient for mocking. </summary>
-        protected VpnServerConfigurationsClient()
+        internal VpnServerConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnServerConfigurationsOperations for mocking. </summary>
+        protected VpnServerConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnServerConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnServerConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnServerConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnServerConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VpnServerConfigurationsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnServerConfiguration>> GetAsync(string resourceGroupName, string vpnServerConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VpnServerConfiguration>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnServerConfiguration> Get(string resourceGroupName, string vpnServerConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VpnServerConfiguration> Get(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnServerConfiguration>> UpdateTagsAsync(string resourceGroupName, string vpnServerConfigurationName, TagsObject vpnServerConfigurationParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VpnServerConfiguration>> UpdateTagsAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnServerConfiguration> UpdateTags(string resourceGroupName, string vpnServerConfigurationName, TagsObject vpnServerConfigurationParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VpnServerConfiguration> ListByResourceGroupAsync(st
 
             async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnServerConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VpnServerConfiguration> ListByResourceGroup(string resou
 
             Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnServerConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VpnServerConfiguration> ListAsync(CancellationToken
         {
             async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnServerConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VpnServerConfiguration> List(CancellationToken cancellat
         {
             Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnServerConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VpnServerConfigurationsCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(vpnServerConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VpnServerConfigurationsCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(vpnServerConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VpnServerConfigurationsDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(vpnServerConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VpnServerConfigurationsDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(vpnServerConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsRestOperations.cs
index a307e4e1dffe6..75b0e2a9f36af 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnServerConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnServerConfigurationsRestClient
+    internal partial class VpnServerConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnServerConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnServerConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnServerConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsOperations.cs
similarity index 85%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsOperations.cs
index bf9d8aa8f2818..5c648e04922a6 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnSiteLinkConnections service client. </summary>
-    public partial class VpnSiteLinkConnectionsClient
+    public partial class VpnSiteLinkConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSiteLinkConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsClient for mocking. </summary>
-        protected VpnSiteLinkConnectionsClient()
+        internal VpnSiteLinkConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsOperations for mocking. </summary>
+        protected VpnSiteLinkConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSiteLinkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSiteLinkConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSiteLinkConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSiteLinkConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VpnSiteLinkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSiteLinkConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<VpnSiteLinkConnection>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSiteLinkConnection> Get(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsOperations.Get");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsRestOperations.cs
similarity index 96%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsRestOperations.cs
index 63239ad347f61..26323926aaef2 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinkConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnSiteLinkConnectionsRestClient
+    internal partial class VpnSiteLinkConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSiteLinkConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSiteLinkConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksOperations.cs
similarity index 91%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksOperations.cs
index e8a2f9035603d..c7f5d9129bb73 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnSiteLinks service client. </summary>
-    public partial class VpnSiteLinksClient
+    public partial class VpnSiteLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSiteLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSiteLinksClient for mocking. </summary>
-        protected VpnSiteLinksClient()
+        internal VpnSiteLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSiteLinksOperations for mocking. </summary>
+        protected VpnSiteLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSiteLinksClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSiteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSiteLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSiteLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSiteLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VpnSiteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSiteLink>> GetAsync(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VpnSiteLink>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSiteLink> Get(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VpnSiteLink> ListByVpnSiteAsync(string resourceGrou
 
             async Task<Page<VpnSiteLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VpnSiteLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSiteLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VpnSiteLink> ListByVpnSite(string resourceGroupName, str
 
             Page<VpnSiteLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VpnSiteLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSiteLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksRestOperations.cs
similarity index 98%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksRestOperations.cs
index 0147b45418348..2dcafc90dd95c 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSiteLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnSiteLinksRestClient
+    internal partial class VpnSiteLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSiteLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSiteLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSiteLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationOperations.cs
similarity index 88%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationOperations.cs
index 5b75714883e8e..02f1ed3d03ea3 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationOperations.cs
@@ -14,23 +14,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnSitesConfiguration service client. </summary>
-    public partial class VpnSitesConfigurationClient
+    public partial class VpnSitesConfigurationOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSitesConfigurationRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSitesConfigurationClient for mocking. </summary>
-        protected VpnSitesConfigurationClient()
+        internal VpnSitesConfigurationRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSitesConfigurationOperations for mocking. </summary>
+        protected VpnSitesConfigurationOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSitesConfigurationClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesConfigurationOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSitesConfigurationClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSitesConfigurationOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSitesConfigurationRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSitesConfigurationRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -55,7 +55,7 @@ public virtual async Task<VpnSitesConfigurationDownloadOperation> StartDownloadA
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationClient.StartDownload");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationOperations.StartDownload");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual VpnSitesConfigurationDownloadOperation StartDownload(string resou
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationClient.StartDownload");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationOperations.StartDownload");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationRestOperations.cs
similarity index 95%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationRestOperations.cs
index 57ca5c08c0e29..6cf76c409fe2a 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesConfigurationRestOperations.cs
@@ -15,20 +15,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnSitesConfigurationRestClient
+    internal partial class VpnSitesConfigurationRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSitesConfigurationRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesConfigurationRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSitesConfigurationRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSitesConfigurationRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesOperations.cs
similarity index 94%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesOperations.cs
index 877bd462cd0f3..bf41c96313963 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The VpnSites service client. </summary>
-    public partial class VpnSitesClient
+    public partial class VpnSitesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSitesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSitesClient for mocking. </summary>
-        protected VpnSitesClient()
+        internal VpnSitesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSitesOperations for mocking. </summary>
+        protected VpnSitesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSitesClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSitesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSitesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSitesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSitesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VpnSitesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSite>> GetAsync(string resourceGroupName, string vpnSiteName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VpnSite>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSite> Get(string resourceGroupName, string vpnSiteName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VpnSite> Get(string resourceGroupName, string vpnSiteNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSite>> UpdateTagsAsync(string resourceGroupName, string vpnSiteName, TagsObject vpnSiteParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VpnSite>> UpdateTagsAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSite> UpdateTags(string resourceGroupName, string vpnSiteName, TagsObject vpnSiteParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VpnSite> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSite>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VpnSite> ListByResourceGroup(string resourceGroupName, C
 
             Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSite> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VpnSite> ListAsync(CancellationToken cancellationTo
         {
             async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSite>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VpnSite> List(CancellationToken cancellationToken = defa
         {
             Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSite> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VpnSitesCreateOrUpdateOperation> StartCreateOrUpdateAs
                 throw new ArgumentNullException(nameof(vpnSiteParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VpnSitesCreateOrUpdateOperation StartCreateOrUpdate(string resour
                 throw new ArgumentNullException(nameof(vpnSiteParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VpnSitesDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(vpnSiteName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VpnSitesDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(vpnSiteName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesRestOperations.cs
index bcf2bcbf33091..cc8ca6dcd2922 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/VpnSitesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class VpnSitesRestClient
+    internal partial class VpnSitesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSitesRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSitesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSitesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesOperations.cs
similarity index 91%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesOperations.cs
index 857c1aee850ef..eaf761330be1d 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Network
 {
     /// <summary> The WebApplicationFirewallPolicies service client. </summary>
-    public partial class WebApplicationFirewallPoliciesClient
+    public partial class WebApplicationFirewallPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal WebApplicationFirewallPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesClient for mocking. </summary>
-        protected WebApplicationFirewallPoliciesClient()
+        internal WebApplicationFirewallPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesOperations for mocking. </summary>
+        protected WebApplicationFirewallPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal WebApplicationFirewallPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal WebApplicationFirewallPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new WebApplicationFirewallPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new WebApplicationFirewallPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal WebApplicationFirewallPoliciesClient(ClientDiagnostics clientDiagnostic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<WebApplicationFirewallPolicy>> GetAsync(string resourceGroupName, string policyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<WebApplicationFirewallPolicy>> GetAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<WebApplicationFirewallPolicy> Get(string resourceGroupName, string policyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<WebApplicationFirewallPolicy> Get(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<WebApplicationFirewallPolicy>> CreateOrUpdateAsync(string resourceGroupName, string policyName, WebApplicationFirewallPolicy parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<WebApplicationFirewallPolicy>> CreateOrUpdate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<WebApplicationFirewallPolicy> CreateOrUpdate(string resourceGroupName, string policyName, WebApplicationFirewallPolicy parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<WebApplicationFirewallPolicy> ListAsync(string reso
 
             async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<WebApplicationFirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<WebApplicationFirewallPolicy> List(string resourceGroupN
 
             Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<WebApplicationFirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<WebApplicationFirewallPolicy> ListAllAsync(Cancella
         {
             async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<WebApplicationFirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<WebApplicationFirewallPolicy> ListAll(CancellationToken
         {
             Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<WebApplicationFirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<WebApplicationFirewallPoliciesDeleteOperation> StartDe
                 throw new ArgumentNullException(nameof(policyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual WebApplicationFirewallPoliciesDeleteOperation StartDelete(string
                 throw new ArgumentNullException(nameof(policyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesRestClient.cs b/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesRestOperations.cs
similarity index 99%
rename from sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesRestClient.cs
rename to sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesRestOperations.cs
index f23f640d0f798..0ed9976e40e30 100644
--- a/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesRestClient.cs
+++ b/sdk/network/Azure.ResourceManager.Network/src/Generated/WebApplicationFirewallPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Network
 {
-    internal partial class WebApplicationFirewallPoliciesRestClient
+    internal partial class WebApplicationFirewallPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public WebApplicationFirewallPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public WebApplicationFirewallPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsOperations.cs
similarity index 94%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsOperations.cs
index e8bd48ef9e896..e55950d3d6138 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The ApplicationDefinitions service client. </summary>
-    public partial class ApplicationDefinitionsClient
+    public partial class ApplicationDefinitionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationDefinitionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationDefinitionsClient for mocking. </summary>
-        protected ApplicationDefinitionsClient()
+        internal ApplicationDefinitionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationDefinitionsOperations for mocking. </summary>
+        protected ApplicationDefinitionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationDefinitionsClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationDefinitionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ApplicationDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ApplicationDefinitionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ApplicationDefinitionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ApplicationDefinitionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ApplicationDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationDefinition>> GetAsync(string resourceGroupName, string applicationDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ApplicationDefinition>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationDefinition> Get(string resourceGroupName, string applicationDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<ApplicationDefinition> Get(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationDefinition>> GetByIdAsync(string applicationDefinitionId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.GetById");
             scope.Start();
             try
             {
@@ -98,7 +98,7 @@ public virtual async Task<Response<ApplicationDefinition>> GetByIdAsync(string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationDefinition> GetById(string applicationDefinitionId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.GetById");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<ApplicationDefinition> ListByResourceGroupAsync(str
 
             async Task<Page<ApplicationDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<ApplicationDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -166,7 +166,7 @@ public virtual Pageable<ApplicationDefinition> ListByResourceGroup(string resour
 
             Page<ApplicationDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -181,7 +181,7 @@ Page<ApplicationDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -212,7 +212,7 @@ public virtual async Task<ApplicationDefinitionsDeleteOperation> StartDeleteAsyn
                 throw new ArgumentNullException(nameof(applicationDefinitionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -241,7 +241,7 @@ public virtual ApplicationDefinitionsDeleteOperation StartDelete(string resource
                 throw new ArgumentNullException(nameof(applicationDefinitionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -275,7 +275,7 @@ public virtual async Task<ApplicationDefinitionsCreateOrUpdateOperation> StartCr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -309,7 +309,7 @@ public virtual ApplicationDefinitionsCreateOrUpdateOperation StartCreateOrUpdate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -333,7 +333,7 @@ public virtual async Task<ApplicationDefinitionsDeleteByIdOperation> StartDelete
                 throw new ArgumentNullException(nameof(applicationDefinitionId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual ApplicationDefinitionsDeleteByIdOperation StartDeleteById(string
                 throw new ArgumentNullException(nameof(applicationDefinitionId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<ApplicationDefinitionsCreateOrUpdateByIdOperation> Sta
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual ApplicationDefinitionsCreateOrUpdateByIdOperation StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationDefinitionsOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsRestOperations.cs
index caa000faee790..9199212644afb 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationDefinitionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ApplicationDefinitionsRestClient
+    internal partial class ApplicationDefinitionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationDefinitionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationDefinitionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationDefinitionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ApplicationDefinitionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsOperations.cs
similarity index 95%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsOperations.cs
index 623377d07c1cf..1f48276bfc546 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Applications service client. </summary>
-    public partial class ApplicationsClient
+    public partial class ApplicationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationsClient for mocking. </summary>
-        protected ApplicationsClient()
+        internal ApplicationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationsOperations for mocking. </summary>
+        protected ApplicationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationsClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ApplicationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ApplicationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ApplicationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> GetAsync(string resourceGroupName, string applicationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Application>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> Get(string resourceGroupName, string applicationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<Application> Get(string resourceGroupName, string applic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> UpdateAsync(string resourceGroupName, string applicationName, Application parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Update");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<Application>> UpdateAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> Update(string resourceGroupName, string applicationName, Application parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Update");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<Application> Update(string resourceGroupName, string app
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> GetByIdAsync(string applicationId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.GetById");
             scope.Start();
             try
             {
@@ -138,7 +138,7 @@ public virtual async Task<Response<Application>> GetByIdAsync(string application
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> GetById(string applicationId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.GetById");
             scope.Start();
             try
             {
@@ -157,7 +157,7 @@ public virtual Response<Application> GetById(string applicationId, CancellationT
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> UpdateByIdAsync(string applicationId, Application parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.UpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.UpdateById");
             scope.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual async Task<Response<Application>> UpdateByIdAsync(string applicat
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> UpdateById(string applicationId, Application parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.UpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.UpdateById");
             scope.Start();
             try
             {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<Application> ListByResourceGroupAsync(string resour
 
             async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Application>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<Application> ListByResourceGroup(string resourceGroupNam
 
             Page<Application> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<Application> FirstPageFunc(int? pageSizeHint)
             }
             Page<Application> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -281,7 +281,7 @@ public virtual AsyncPageable<Application> ListBySubscriptionAsync(CancellationTo
         {
             async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -296,7 +296,7 @@ async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Application>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -318,7 +318,7 @@ public virtual Pageable<Application> ListBySubscription(CancellationToken cancel
         {
             Page<Application> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -333,7 +333,7 @@ Page<Application> FirstPageFunc(int? pageSizeHint)
             }
             Page<Application> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -364,7 +364,7 @@ public virtual async Task<ApplicationsDeleteOperation> StartDeleteAsync(string r
                 throw new ArgumentNullException(nameof(applicationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -393,7 +393,7 @@ public virtual ApplicationsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(applicationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -427,7 +427,7 @@ public virtual async Task<ApplicationsCreateOrUpdateOperation> StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -461,7 +461,7 @@ public virtual ApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string re
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -485,7 +485,7 @@ public virtual async Task<ApplicationsDeleteByIdOperation> StartDeleteByIdAsync(
                 throw new ArgumentNullException(nameof(applicationId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -509,7 +509,7 @@ public virtual ApplicationsDeleteByIdOperation StartDeleteById(string applicatio
                 throw new ArgumentNullException(nameof(applicationId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -538,7 +538,7 @@ public virtual async Task<ApplicationsCreateOrUpdateByIdOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
@@ -567,7 +567,7 @@ public virtual ApplicationsCreateOrUpdateByIdOperation StartCreateOrUpdateById(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsRestOperations.cs
index e8f6d6f40e119..e6f33036d03ae 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ApplicationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ApplicationsRestClient
+    internal partial class ApplicationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationsRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ApplicationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationOperations.cs
similarity index 88%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationOperations.cs
index 24f7610aad150..c13161ce3ba75 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationOperations.cs
@@ -16,22 +16,22 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Authorization service client. </summary>
-    public partial class AuthorizationClient
+    public partial class AuthorizationOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AuthorizationRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AuthorizationClient for mocking. </summary>
-        protected AuthorizationClient()
+        internal AuthorizationRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AuthorizationOperations for mocking. </summary>
+        protected AuthorizationOperations()
         {
         }
-        /// <summary> Initializes a new instance of AuthorizationClient. </summary>
+        /// <summary> Initializes a new instance of AuthorizationOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AuthorizationClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal AuthorizationOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new AuthorizationRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new AuthorizationRestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<OperationAutoGenerated2> ListAsync(CancellationToke
         {
             async Task<Page<OperationAutoGenerated2>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AuthorizationClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AuthorizationOperations.List");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<OperationAutoGenerated2>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OperationAutoGenerated2>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AuthorizationClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AuthorizationOperations.List");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<OperationAutoGenerated2> List(CancellationToken cancella
         {
             Page<OperationAutoGenerated2> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AuthorizationClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AuthorizationOperations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<OperationAutoGenerated2> FirstPageFunc(int? pageSizeHint)
             }
             Page<OperationAutoGenerated2> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AuthorizationClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AuthorizationOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationRestOperations.cs
similarity index 97%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationRestOperations.cs
index e25e2981e8e02..cf77654127991 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/AuthorizationRestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class AuthorizationRestClient
+    internal partial class AuthorizationRestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AuthorizationRestClient. </summary>
+        /// <summary> Initializes a new instance of AuthorizationRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public AuthorizationRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public AuthorizationRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentOperations.cs
similarity index 94%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentOperations.cs
index c07b06996a560..a4dff69dc4118 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Deployment service client. </summary>
-    public partial class DeploymentClient
+    public partial class DeploymentOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DeploymentRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DeploymentClient for mocking. </summary>
-        protected DeploymentClient()
+        internal DeploymentRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DeploymentOperations for mocking. </summary>
+        protected DeploymentOperations()
         {
         }
-        /// <summary> Initializes a new instance of DeploymentClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DeploymentClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DeploymentOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DeploymentRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DeploymentRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DeploymentClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentOperation>> GetAtScopeAsync(string scope, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtScope");
             scope0.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<DeploymentOperation>> GetAtScopeAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentOperation> GetAtScope(string scope, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtScope");
             scope0.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<DeploymentOperation> GetAtScope(string scope, string dep
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentOperation>> GetAtTenantScopeAsync(string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtTenantScope");
             scope0.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<DeploymentOperation>> GetAtTenantScopeAsync(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentOperation> GetAtTenantScope(string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtTenantScope");
             scope0.Start();
             try
             {
@@ -122,7 +122,7 @@ public virtual Response<DeploymentOperation> GetAtTenantScope(string deploymentN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentOperation>> GetAtManagementGroupScopeAsync(string groupId, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response<DeploymentOperation>> GetAtManagementGroupSco
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentOperation> GetAtManagementGroupScope(string groupId, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response<DeploymentOperation> GetAtManagementGroupScope(string gr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentOperation>> GetAtSubscriptionScopeAsync(string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<DeploymentOperation>> GetAtSubscriptionScopeA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentOperation> GetAtSubscriptionScope(string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.GetAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.GetAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -200,7 +200,7 @@ public virtual Response<DeploymentOperation> GetAtSubscriptionScope(string deplo
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentOperation>> GetAsync(string resourceGroupName, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.Get");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.Get");
             scope0.Start();
             try
             {
@@ -220,7 +220,7 @@ public virtual async Task<Response<DeploymentOperation>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentOperation> Get(string resourceGroupName, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.Get");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.Get");
             scope0.Start();
             try
             {
@@ -251,7 +251,7 @@ public virtual AsyncPageable<DeploymentOperation> ListAtScopeAsync(string scope,
 
             async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -266,7 +266,7 @@ async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentOperation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -300,7 +300,7 @@ public virtual Pageable<DeploymentOperation> ListAtScope(string scope, string de
 
             Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -315,7 +315,7 @@ Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentOperation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -344,7 +344,7 @@ public virtual AsyncPageable<DeploymentOperation> ListAtTenantScopeAsync(string
 
             async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -359,7 +359,7 @@ async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentOperation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -388,7 +388,7 @@ public virtual Pageable<DeploymentOperation> ListAtTenantScope(string deployment
 
             Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -403,7 +403,7 @@ Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentOperation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -437,7 +437,7 @@ public virtual AsyncPageable<DeploymentOperation> ListAtManagementGroupScopeAsyn
 
             async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -452,7 +452,7 @@ async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentOperation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -486,7 +486,7 @@ public virtual Pageable<DeploymentOperation> ListAtManagementGroupScope(string g
 
             Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -501,7 +501,7 @@ Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentOperation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -530,7 +530,7 @@ public virtual AsyncPageable<DeploymentOperation> ListAtSubscriptionScopeAsync(s
 
             async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -545,7 +545,7 @@ async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentOperation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -574,7 +574,7 @@ public virtual Pageable<DeploymentOperation> ListAtSubscriptionScope(string depl
 
             Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -589,7 +589,7 @@ Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentOperation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -623,7 +623,7 @@ public virtual AsyncPageable<DeploymentOperation> ListAsync(string resourceGroup
 
             async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope0.Start();
                 try
                 {
@@ -638,7 +638,7 @@ async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentOperation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope0.Start();
                 try
                 {
@@ -672,7 +672,7 @@ public virtual Pageable<DeploymentOperation> List(string resourceGroupName, stri
 
             Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope0.Start();
                 try
                 {
@@ -687,7 +687,7 @@ Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentOperation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope0.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentRestOperations.cs
index 84725b9249820..66fdd82f0b0ce 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class DeploymentRestClient
+    internal partial class DeploymentRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DeploymentRestClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DeploymentRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DeploymentRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsOperations.cs
similarity index 94%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsOperations.cs
index eb55be35738ed..b511e8e9f5f88 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The DeploymentScripts service client. </summary>
-    public partial class DeploymentScriptsClient
+    public partial class DeploymentScriptsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DeploymentScriptsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DeploymentScriptsClient for mocking. </summary>
-        protected DeploymentScriptsClient()
+        internal DeploymentScriptsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DeploymentScriptsOperations for mocking. </summary>
+        protected DeploymentScriptsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DeploymentScriptsClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentScriptsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DeploymentScriptsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DeploymentScriptsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DeploymentScriptsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DeploymentScriptsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DeploymentScriptsClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentScript>> UpdateAsync(string resourceGroupName, string scriptName, DeploymentScriptUpdateParameter deploymentScript = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.Update");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<DeploymentScript>> UpdateAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentScript> Update(string resourceGroupName, string scriptName, DeploymentScriptUpdateParameter deploymentScript = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.Update");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<DeploymentScript> Update(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentScript>> GetAsync(string resourceGroupName, string scriptName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.Get");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<DeploymentScript>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentScript> Get(string resourceGroupName, string scriptName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.Get");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<DeploymentScript> Get(string resourceGroupName, string s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string scriptName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.Delete");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string scriptName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.Delete");
             scope.Start();
             try
             {
@@ -159,7 +159,7 @@ public virtual Response Delete(string resourceGroupName, string scriptName, Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ScriptLogsList>> GetLogsAsync(string resourceGroupName, string scriptName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.GetLogs");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.GetLogs");
             scope.Start();
             try
             {
@@ -178,7 +178,7 @@ public virtual async Task<Response<ScriptLogsList>> GetLogsAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ScriptLogsList> GetLogs(string resourceGroupName, string scriptName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.GetLogs");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.GetLogs");
             scope.Start();
             try
             {
@@ -198,7 +198,7 @@ public virtual Response<ScriptLogsList> GetLogs(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ScriptLog>> GetLogsDefaultAsync(string resourceGroupName, string scriptName, int? tail = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.GetLogsDefault");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.GetLogsDefault");
             scope.Start();
             try
             {
@@ -218,7 +218,7 @@ public virtual async Task<Response<ScriptLog>> GetLogsDefaultAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ScriptLog> GetLogsDefault(string resourceGroupName, string scriptName, int? tail = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.GetLogsDefault");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.GetLogsDefault");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual AsyncPageable<DeploymentScript> ListBySubscriptionAsync(Cancellat
         {
             async Task<Page<DeploymentScript>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ async Task<Page<DeploymentScript>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentScript>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -274,7 +274,7 @@ public virtual Pageable<DeploymentScript> ListBySubscription(CancellationToken c
         {
             Page<DeploymentScript> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -289,7 +289,7 @@ Page<DeploymentScript> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentScript> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -317,7 +317,7 @@ public virtual AsyncPageable<DeploymentScript> ListByResourceGroupAsync(string r
 
             async Task<Page<DeploymentScript>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -332,7 +332,7 @@ async Task<Page<DeploymentScript>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentScript>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -360,7 +360,7 @@ public virtual Pageable<DeploymentScript> ListByResourceGroup(string resourceGro
 
             Page<DeploymentScript> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -375,7 +375,7 @@ Page<DeploymentScript> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentScript> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -411,7 +411,7 @@ public virtual async Task<DeploymentScriptsCreateOperation> StartCreateAsync(str
                 throw new ArgumentNullException(nameof(deploymentScript));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.StartCreate");
             scope.Start();
             try
             {
@@ -445,7 +445,7 @@ public virtual DeploymentScriptsCreateOperation StartCreate(string resourceGroup
                 throw new ArgumentNullException(nameof(deploymentScript));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentScriptsOperations.StartCreate");
             scope.Start();
             try
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsRestOperations.cs
index 32de5f696b6d1..13ca99831c18d 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentScriptsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class DeploymentScriptsRestClient
+    internal partial class DeploymentScriptsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DeploymentScriptsRestClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentScriptsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DeploymentScriptsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DeploymentScriptsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsOperations.cs
similarity index 95%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsOperations.cs
index b5165d726597a..986147d8685c7 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Deployments service client. </summary>
-    public partial class DeploymentsClient
+    public partial class DeploymentsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DeploymentsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DeploymentsClient for mocking. </summary>
-        protected DeploymentsClient()
+        internal DeploymentsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DeploymentsOperations for mocking. </summary>
+        protected DeploymentsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DeploymentsClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DeploymentsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DeploymentsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DeploymentsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DeploymentsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DeploymentsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAtScopeAsync(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtScope");
             scope0.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response> CheckExistenceAtScopeAsync(string scope, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistenceAtScope(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtScope");
             scope0.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response CheckExistenceAtScope(string scope, string deploymentNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExtended>> GetAtScopeAsync(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtScope");
             scope0.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<DeploymentExtended>> GetAtScopeAsync(string s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExtended> GetAtScope(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtScope");
             scope0.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response<DeploymentExtended> GetAtScope(string scope, string depl
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CancelAtScopeAsync(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtScope");
             scope0.Start();
             try
             {
@@ -138,7 +138,7 @@ public virtual async Task<Response> CancelAtScopeAsync(string scope, string depl
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CancelAtScope(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtScope");
             scope0.Start();
             try
             {
@@ -157,7 +157,7 @@ public virtual Response CancelAtScope(string scope, string deploymentName, Cance
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtScopeAsync(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtScope");
             scope0.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtScop
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExportResult> ExportTemplateAtScope(string scope, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtScope");
             scope0.Start();
             try
             {
@@ -194,7 +194,7 @@ public virtual Response<DeploymentExportResult> ExportTemplateAtScope(string sco
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAtTenantScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtTenantScope");
             scope0.Start();
             try
             {
@@ -212,7 +212,7 @@ public virtual async Task<Response> CheckExistenceAtTenantScopeAsync(string depl
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistenceAtTenantScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtTenantScope");
             scope0.Start();
             try
             {
@@ -230,7 +230,7 @@ public virtual Response CheckExistenceAtTenantScope(string deploymentName, Cance
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExtended>> GetAtTenantScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtTenantScope");
             scope0.Start();
             try
             {
@@ -248,7 +248,7 @@ public virtual async Task<Response<DeploymentExtended>> GetAtTenantScopeAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExtended> GetAtTenantScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtTenantScope");
             scope0.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual Response<DeploymentExtended> GetAtTenantScope(string deploymentNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CancelAtTenantScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtTenantScope");
             scope0.Start();
             try
             {
@@ -284,7 +284,7 @@ public virtual async Task<Response> CancelAtTenantScopeAsync(string deploymentNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CancelAtTenantScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtTenantScope");
             scope0.Start();
             try
             {
@@ -302,7 +302,7 @@ public virtual Response CancelAtTenantScope(string deploymentName, CancellationT
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtTenantScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtTenantScope");
             scope0.Start();
             try
             {
@@ -320,7 +320,7 @@ public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtTena
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExportResult> ExportTemplateAtTenantScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtTenantScope");
             scope0.Start();
             try
             {
@@ -339,7 +339,7 @@ public virtual Response<DeploymentExportResult> ExportTemplateAtTenantScope(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAtManagementGroupScopeAsync(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<Response> CheckExistenceAtManagementGroupScopeAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistenceAtManagementGroupScope(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -377,7 +377,7 @@ public virtual Response CheckExistenceAtManagementGroupScope(string groupId, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExtended>> GetAtManagementGroupScopeAsync(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -396,7 +396,7 @@ public virtual async Task<Response<DeploymentExtended>> GetAtManagementGroupScop
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExtended> GetAtManagementGroupScope(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual Response<DeploymentExtended> GetAtManagementGroupScope(string gro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CancelAtManagementGroupScopeAsync(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -434,7 +434,7 @@ public virtual async Task<Response> CancelAtManagementGroupScopeAsync(string gro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CancelAtManagementGroupScope(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -453,7 +453,7 @@ public virtual Response CancelAtManagementGroupScope(string groupId, string depl
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtManagementGroupScopeAsync(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -472,7 +472,7 @@ public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtMana
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExportResult> ExportTemplateAtManagementGroupScope(string groupId, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -490,7 +490,7 @@ public virtual Response<DeploymentExportResult> ExportTemplateAtManagementGroupS
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAtSubscriptionScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -508,7 +508,7 @@ public virtual async Task<Response> CheckExistenceAtSubscriptionScopeAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistenceAtSubscriptionScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistenceAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistenceAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -526,7 +526,7 @@ public virtual Response CheckExistenceAtSubscriptionScope(string deploymentName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExtended>> GetAtSubscriptionScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -544,7 +544,7 @@ public virtual async Task<Response<DeploymentExtended>> GetAtSubscriptionScopeAs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExtended> GetAtSubscriptionScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.GetAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.GetAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -562,7 +562,7 @@ public virtual Response<DeploymentExtended> GetAtSubscriptionScope(string deploy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CancelAtSubscriptionScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -580,7 +580,7 @@ public virtual async Task<Response> CancelAtSubscriptionScopeAsync(string deploy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CancelAtSubscriptionScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CancelAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CancelAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -598,7 +598,7 @@ public virtual Response CancelAtSubscriptionScope(string deploymentName, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtSubscriptionScopeAsync(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -616,7 +616,7 @@ public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAtSubs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExportResult> ExportTemplateAtSubscriptionScope(string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplateAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplateAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -635,7 +635,7 @@ public virtual Response<DeploymentExportResult> ExportTemplateAtSubscriptionScop
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistence");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistence");
             scope0.Start();
             try
             {
@@ -654,7 +654,7 @@ public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistence(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistence");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistence");
             scope0.Start();
             try
             {
@@ -673,7 +673,7 @@ public virtual Response CheckExistence(string resourceGroupName, string deployme
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExtended>> GetAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.Get");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.Get");
             scope0.Start();
             try
             {
@@ -692,7 +692,7 @@ public virtual async Task<Response<DeploymentExtended>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExtended> Get(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.Get");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.Get");
             scope0.Start();
             try
             {
@@ -711,7 +711,7 @@ public virtual Response<DeploymentExtended> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CancelAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.Cancel");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.Cancel");
             scope0.Start();
             try
             {
@@ -730,7 +730,7 @@ public virtual async Task<Response> CancelAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Cancel(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.Cancel");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.Cancel");
             scope0.Start();
             try
             {
@@ -749,7 +749,7 @@ public virtual Response Cancel(string resourceGroupName, string deploymentName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplate");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplate");
             scope0.Start();
             try
             {
@@ -768,7 +768,7 @@ public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExportResult> ExportTemplate(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplate");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplate");
             scope0.Start();
             try
             {
@@ -786,7 +786,7 @@ public virtual Response<DeploymentExportResult> ExportTemplate(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TemplateHashResult>> CalculateTemplateHashAsync(object template, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CalculateTemplateHash");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CalculateTemplateHash");
             scope0.Start();
             try
             {
@@ -804,7 +804,7 @@ public virtual async Task<Response<TemplateHashResult>> CalculateTemplateHashAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TemplateHashResult> CalculateTemplateHash(object template, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.CalculateTemplateHash");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.CalculateTemplateHash");
             scope0.Start();
             try
             {
@@ -831,7 +831,7 @@ public virtual AsyncPageable<DeploymentExtended> ListAtScopeAsync(string scope,
 
             async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -846,7 +846,7 @@ async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentExtended>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -876,7 +876,7 @@ public virtual Pageable<DeploymentExtended> ListAtScope(string scope, string fil
 
             Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -891,7 +891,7 @@ Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentExtended> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtScope");
                 scope0.Start();
                 try
                 {
@@ -915,7 +915,7 @@ public virtual AsyncPageable<DeploymentExtended> ListAtTenantScopeAsync(string f
         {
             async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -930,7 +930,7 @@ async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentExtended>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -954,7 +954,7 @@ public virtual Pageable<DeploymentExtended> ListAtTenantScope(string filter = nu
         {
             Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -969,7 +969,7 @@ Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentExtended> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtTenantScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtTenantScope");
                 scope0.Start();
                 try
                 {
@@ -999,7 +999,7 @@ public virtual AsyncPageable<DeploymentExtended> ListAtManagementGroupScopeAsync
 
             async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -1014,7 +1014,7 @@ async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentExtended>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -1044,7 +1044,7 @@ public virtual Pageable<DeploymentExtended> ListAtManagementGroupScope(string gr
 
             Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -1059,7 +1059,7 @@ Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentExtended> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtManagementGroupScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtManagementGroupScope");
                 scope0.Start();
                 try
                 {
@@ -1083,7 +1083,7 @@ public virtual AsyncPageable<DeploymentExtended> ListAtSubscriptionScopeAsync(st
         {
             async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -1098,7 +1098,7 @@ async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentExtended>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -1122,7 +1122,7 @@ public virtual Pageable<DeploymentExtended> ListAtSubscriptionScope(string filte
         {
             Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -1137,7 +1137,7 @@ Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentExtended> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListAtSubscriptionScope");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListAtSubscriptionScope");
                 scope0.Start();
                 try
                 {
@@ -1167,7 +1167,7 @@ public virtual AsyncPageable<DeploymentExtended> ListByResourceGroupAsync(string
 
             async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -1182,7 +1182,7 @@ async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentExtended>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -1212,7 +1212,7 @@ public virtual Pageable<DeploymentExtended> ListByResourceGroup(string resourceG
 
             Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -1227,7 +1227,7 @@ Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentExtended> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -1258,7 +1258,7 @@ public virtual async Task<DeploymentsDeleteAtScopeOperation> StartDeleteAtScopeA
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtScope");
             scope0.Start();
             try
             {
@@ -1287,7 +1287,7 @@ public virtual DeploymentsDeleteAtScopeOperation StartDeleteAtScope(string scope
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtScope");
             scope0.Start();
             try
             {
@@ -1321,7 +1321,7 @@ public virtual async Task<DeploymentsCreateOrUpdateAtScopeOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtScope");
             scope0.Start();
             try
             {
@@ -1355,7 +1355,7 @@ public virtual DeploymentsCreateOrUpdateAtScopeOperation StartCreateOrUpdateAtSc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtScope");
             scope0.Start();
             try
             {
@@ -1389,7 +1389,7 @@ public virtual async Task<DeploymentsValidateAtScopeOperation> StartValidateAtSc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtScope");
             scope0.Start();
             try
             {
@@ -1423,7 +1423,7 @@ public virtual DeploymentsValidateAtScopeOperation StartValidateAtScope(string s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtScope");
             scope0.Start();
             try
             {
@@ -1447,7 +1447,7 @@ public virtual async Task<DeploymentsDeleteAtTenantScopeOperation> StartDeleteAt
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtTenantScope");
             scope0.Start();
             try
             {
@@ -1471,7 +1471,7 @@ public virtual DeploymentsDeleteAtTenantScopeOperation StartDeleteAtTenantScope(
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtTenantScope");
             scope0.Start();
             try
             {
@@ -1500,7 +1500,7 @@ public virtual async Task<DeploymentsCreateOrUpdateAtTenantScopeOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtTenantScope");
             scope0.Start();
             try
             {
@@ -1529,7 +1529,7 @@ public virtual DeploymentsCreateOrUpdateAtTenantScopeOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtTenantScope");
             scope0.Start();
             try
             {
@@ -1558,7 +1558,7 @@ public virtual async Task<DeploymentsValidateAtTenantScopeOperation> StartValida
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtTenantScope");
             scope0.Start();
             try
             {
@@ -1587,7 +1587,7 @@ public virtual DeploymentsValidateAtTenantScopeOperation StartValidateAtTenantSc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtTenantScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtTenantScope");
             scope0.Start();
             try
             {
@@ -1616,7 +1616,7 @@ public virtual async Task<DeploymentsDeleteAtManagementGroupScopeOperation> Star
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -1645,7 +1645,7 @@ public virtual DeploymentsDeleteAtManagementGroupScopeOperation StartDeleteAtMan
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -1679,7 +1679,7 @@ public virtual async Task<DeploymentsCreateOrUpdateAtManagementGroupScopeOperati
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -1713,7 +1713,7 @@ public virtual DeploymentsCreateOrUpdateAtManagementGroupScopeOperation StartCre
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -1747,7 +1747,7 @@ public virtual async Task<DeploymentsValidateAtManagementGroupScopeOperation> St
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -1781,7 +1781,7 @@ public virtual DeploymentsValidateAtManagementGroupScopeOperation StartValidateA
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtManagementGroupScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtManagementGroupScope");
             scope0.Start();
             try
             {
@@ -1805,7 +1805,7 @@ public virtual async Task<DeploymentsDeleteAtSubscriptionScopeOperation> StartDe
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -1829,7 +1829,7 @@ public virtual DeploymentsDeleteAtSubscriptionScopeOperation StartDeleteAtSubscr
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDeleteAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDeleteAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -1858,7 +1858,7 @@ public virtual async Task<DeploymentsCreateOrUpdateAtSubscriptionScopeOperation>
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -1887,7 +1887,7 @@ public virtual DeploymentsCreateOrUpdateAtSubscriptionScopeOperation StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdateAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdateAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -1916,7 +1916,7 @@ public virtual async Task<DeploymentsValidateAtSubscriptionScopeOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -1945,7 +1945,7 @@ public virtual DeploymentsValidateAtSubscriptionScopeOperation StartValidateAtSu
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidateAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidateAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -1974,7 +1974,7 @@ public virtual async Task<DeploymentsWhatIfAtSubscriptionScopeOperation> StartWh
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartWhatIfAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartWhatIfAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -2003,7 +2003,7 @@ public virtual DeploymentsWhatIfAtSubscriptionScopeOperation StartWhatIfAtSubscr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartWhatIfAtSubscriptionScope");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartWhatIfAtSubscriptionScope");
             scope0.Start();
             try
             {
@@ -2032,7 +2032,7 @@ public virtual async Task<DeploymentsDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDelete");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDelete");
             scope0.Start();
             try
             {
@@ -2061,7 +2061,7 @@ public virtual DeploymentsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartDelete");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDelete");
             scope0.Start();
             try
             {
@@ -2095,7 +2095,7 @@ public virtual async Task<DeploymentsCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdate");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdate");
             scope0.Start();
             try
             {
@@ -2129,7 +2129,7 @@ public virtual DeploymentsCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdate");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdate");
             scope0.Start();
             try
             {
@@ -2163,7 +2163,7 @@ public virtual async Task<DeploymentsValidateOperation> StartValidateAsync(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidate");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidate");
             scope0.Start();
             try
             {
@@ -2197,7 +2197,7 @@ public virtual DeploymentsValidateOperation StartValidate(string resourceGroupNa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartValidate");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartValidate");
             scope0.Start();
             try
             {
@@ -2231,7 +2231,7 @@ public virtual async Task<DeploymentsWhatIfOperation> StartWhatIfAsync(string re
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartWhatIf");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartWhatIf");
             scope0.Start();
             try
             {
@@ -2265,7 +2265,7 @@ public virtual DeploymentsWhatIfOperation StartWhatIf(string resourceGroupName,
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsClient.StartWhatIf");
+            using var scope0 = _clientDiagnostics.CreateScope("DeploymentsOperations.StartWhatIf");
             scope0.Start();
             try
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsRestOperations.cs
index 31e8dde08f3fd..d574fc080c137 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/DeploymentsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class DeploymentsRestClient
+    internal partial class DeploymentsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DeploymentsRestClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DeploymentsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DeploymentsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesOperations.cs
similarity index 93%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesOperations.cs
index 505dfa640e64c..733e73a6b9337 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Features service client. </summary>
-    public partial class FeaturesClient
+    public partial class FeaturesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FeaturesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FeaturesClient for mocking. </summary>
-        protected FeaturesClient()
+        internal FeaturesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FeaturesOperations for mocking. </summary>
+        protected FeaturesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FeaturesClient. </summary>
+        /// <summary> Initializes a new instance of FeaturesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FeaturesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FeaturesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FeaturesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FeaturesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal FeaturesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FeatureResult>> GetAsync(string resourceProviderNamespace, string featureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FeaturesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<FeatureResult>> GetAsync(string resourceProvi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FeatureResult> Get(string resourceProviderNamespace, string featureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FeaturesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<FeatureResult> Get(string resourceProviderNamespace, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FeatureResult>> RegisterAsync(string resourceProviderNamespace, string featureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FeaturesClient.Register");
+            using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.Register");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<FeatureResult>> RegisterAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FeatureResult> Register(string resourceProviderNamespace, string featureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FeaturesClient.Register");
+            using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.Register");
             scope.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response<FeatureResult> Register(string resourceProviderNamespace
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FeatureResult>> UnregisterAsync(string resourceProviderNamespace, string featureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FeaturesClient.Unregister");
+            using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.Unregister");
             scope.Start();
             try
             {
@@ -138,7 +138,7 @@ public virtual async Task<Response<FeatureResult>> UnregisterAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FeatureResult> Unregister(string resourceProviderNamespace, string featureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FeaturesClient.Unregister");
+            using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.Unregister");
             scope.Start();
             try
             {
@@ -157,7 +157,7 @@ public virtual AsyncPageable<FeatureResult> ListAllAsync(CancellationToken cance
         {
             async Task<Page<FeatureResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ async Task<Page<FeatureResult>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FeatureResult>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -194,7 +194,7 @@ public virtual Pageable<FeatureResult> ListAll(CancellationToken cancellationTok
         {
             Page<FeatureResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ Page<FeatureResult> FirstPageFunc(int? pageSizeHint)
             }
             Page<FeatureResult> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -237,7 +237,7 @@ public virtual AsyncPageable<FeatureResult> ListAsync(string resourceProviderNam
 
             async Task<Page<FeatureResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ async Task<Page<FeatureResult>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FeatureResult>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -280,7 +280,7 @@ public virtual Pageable<FeatureResult> List(string resourceProviderNamespace, Ca
 
             Page<FeatureResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ Page<FeatureResult> FirstPageFunc(int? pageSizeHint)
             }
             Page<FeatureResult> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FeaturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FeaturesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesRestOperations.cs
index 6311a6ac290b9..38e990ff7e7d8 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/FeaturesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class FeaturesRestClient
+    internal partial class FeaturesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FeaturesRestClient. </summary>
+        /// <summary> Initializes a new instance of FeaturesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FeaturesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FeaturesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksOperations.cs
similarity index 95%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksOperations.cs
index 5dec7c0f4dc89..00bb9d35b5db0 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The ManagementLocks service client. </summary>
-    public partial class ManagementLocksClient
+    public partial class ManagementLocksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ManagementLocksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ManagementLocksClient for mocking. </summary>
-        protected ManagementLocksClient()
+        internal ManagementLocksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ManagementLocksOperations for mocking. </summary>
+        protected ManagementLocksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ManagementLocksClient. </summary>
+        /// <summary> Initializes a new instance of ManagementLocksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ManagementLocksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ManagementLocksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ManagementLocksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ManagementLocksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ManagementLocksClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateAtResourceGroupLevelAsync(string resourceGroupName, string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateAtResourceGroupLevel");
+            using var scope = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateAtResourceGroupLevel");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateAtResour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> CreateOrUpdateAtResourceGroupLevel(string resourceGroupName, string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateAtResourceGroupLevel");
+            using var scope = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateAtResourceGroupLevel");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<ManagementLockObject> CreateOrUpdateAtResourceGroupLevel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAtResourceGroupLevelAsync(string resourceGroupName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteAtResourceGroupLevel");
+            using var scope = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteAtResourceGroupLevel");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response> DeleteAtResourceGroupLevelAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAtResourceGroupLevel(string resourceGroupName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteAtResourceGroupLevel");
+            using var scope = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteAtResourceGroupLevel");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response DeleteAtResourceGroupLevel(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> GetAtResourceGroupLevelAsync(string resourceGroupName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementLocksClient.GetAtResourceGroupLevel");
+            using var scope = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetAtResourceGroupLevel");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<ManagementLockObject>> GetAtResourceGroupLeve
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> GetAtResourceGroupLevel(string resourceGroupName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementLocksClient.GetAtResourceGroupLevel");
+            using var scope = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetAtResourceGroupLevel");
             scope.Start();
             try
             {
@@ -160,7 +160,7 @@ public virtual Response<ManagementLockObject> GetAtResourceGroupLevel(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateByScopeAsync(string scope, string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateByScope");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateByScope");
             scope0.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateByScopeA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> CreateOrUpdateByScope(string scope, string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateByScope");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateByScope");
             scope0.Start();
             try
             {
@@ -199,7 +199,7 @@ public virtual Response<ManagementLockObject> CreateOrUpdateByScope(string scope
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteByScopeAsync(string scope, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteByScope");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteByScope");
             scope0.Start();
             try
             {
@@ -218,7 +218,7 @@ public virtual async Task<Response> DeleteByScopeAsync(string scope, string lock
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteByScope(string scope, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteByScope");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteByScope");
             scope0.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual Response DeleteByScope(string scope, string lockName, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> GetByScopeAsync(string scope, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.GetByScope");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetByScope");
             scope0.Start();
             try
             {
@@ -256,7 +256,7 @@ public virtual async Task<Response<ManagementLockObject>> GetByScopeAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> GetByScope(string scope, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.GetByScope");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetByScope");
             scope0.Start();
             try
             {
@@ -280,7 +280,7 @@ public virtual Response<ManagementLockObject> GetByScope(string scope, string lo
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateAtResourceLevelAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateAtResourceLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateAtResourceLevel");
             scope0.Start();
             try
             {
@@ -304,7 +304,7 @@ public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateAtResour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> CreateOrUpdateAtResourceLevel(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateAtResourceLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateAtResourceLevel");
             scope0.Start();
             try
             {
@@ -327,7 +327,7 @@ public virtual Response<ManagementLockObject> CreateOrUpdateAtResourceLevel(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAtResourceLevelAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteAtResourceLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteAtResourceLevel");
             scope0.Start();
             try
             {
@@ -350,7 +350,7 @@ public virtual async Task<Response> DeleteAtResourceLevelAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAtResourceLevel(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteAtResourceLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteAtResourceLevel");
             scope0.Start();
             try
             {
@@ -373,7 +373,7 @@ public virtual Response DeleteAtResourceLevel(string resourceGroupName, string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> GetAtResourceLevelAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.GetAtResourceLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetAtResourceLevel");
             scope0.Start();
             try
             {
@@ -396,7 +396,7 @@ public virtual async Task<Response<ManagementLockObject>> GetAtResourceLevelAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> GetAtResourceLevel(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.GetAtResourceLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetAtResourceLevel");
             scope0.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual Response<ManagementLockObject> GetAtResourceLevel(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateAtSubscriptionLevelAsync(string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateAtSubscriptionLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateAtSubscriptionLevel");
             scope0.Start();
             try
             {
@@ -434,7 +434,7 @@ public virtual async Task<Response<ManagementLockObject>> CreateOrUpdateAtSubscr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> CreateOrUpdateAtSubscriptionLevel(string lockName, ManagementLockObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.CreateOrUpdateAtSubscriptionLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.CreateOrUpdateAtSubscriptionLevel");
             scope0.Start();
             try
             {
@@ -452,7 +452,7 @@ public virtual Response<ManagementLockObject> CreateOrUpdateAtSubscriptionLevel(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAtSubscriptionLevelAsync(string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteAtSubscriptionLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteAtSubscriptionLevel");
             scope0.Start();
             try
             {
@@ -470,7 +470,7 @@ public virtual async Task<Response> DeleteAtSubscriptionLevelAsync(string lockNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAtSubscriptionLevel(string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.DeleteAtSubscriptionLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.DeleteAtSubscriptionLevel");
             scope0.Start();
             try
             {
@@ -488,7 +488,7 @@ public virtual Response DeleteAtSubscriptionLevel(string lockName, CancellationT
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementLockObject>> GetAtSubscriptionLevelAsync(string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.GetAtSubscriptionLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetAtSubscriptionLevel");
             scope0.Start();
             try
             {
@@ -506,7 +506,7 @@ public virtual async Task<Response<ManagementLockObject>> GetAtSubscriptionLevel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementLockObject> GetAtSubscriptionLevel(string lockName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.GetAtSubscriptionLevel");
+            using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.GetAtSubscriptionLevel");
             scope0.Start();
             try
             {
@@ -532,7 +532,7 @@ public virtual AsyncPageable<ManagementLockObject> ListAtResourceGroupLevelAsync
 
             async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceGroupLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceGroupLevel");
                 scope0.Start();
                 try
                 {
@@ -547,7 +547,7 @@ async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ManagementLockObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceGroupLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceGroupLevel");
                 scope0.Start();
                 try
                 {
@@ -576,7 +576,7 @@ public virtual Pageable<ManagementLockObject> ListAtResourceGroupLevel(string re
 
             Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceGroupLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceGroupLevel");
                 scope0.Start();
                 try
                 {
@@ -591,7 +591,7 @@ Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<ManagementLockObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceGroupLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceGroupLevel");
                 scope0.Start();
                 try
                 {
@@ -640,7 +640,7 @@ public virtual AsyncPageable<ManagementLockObject> ListAtResourceLevelAsync(stri
 
             async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceLevel");
                 scope0.Start();
                 try
                 {
@@ -655,7 +655,7 @@ async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ManagementLockObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceLevel");
                 scope0.Start();
                 try
                 {
@@ -704,7 +704,7 @@ public virtual Pageable<ManagementLockObject> ListAtResourceLevel(string resourc
 
             Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceLevel");
                 scope0.Start();
                 try
                 {
@@ -719,7 +719,7 @@ Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<ManagementLockObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtResourceLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtResourceLevel");
                 scope0.Start();
                 try
                 {
@@ -742,7 +742,7 @@ public virtual AsyncPageable<ManagementLockObject> ListAtSubscriptionLevelAsync(
         {
             async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtSubscriptionLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtSubscriptionLevel");
                 scope0.Start();
                 try
                 {
@@ -757,7 +757,7 @@ async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ManagementLockObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtSubscriptionLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtSubscriptionLevel");
                 scope0.Start();
                 try
                 {
@@ -780,7 +780,7 @@ public virtual Pageable<ManagementLockObject> ListAtSubscriptionLevel(string fil
         {
             Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtSubscriptionLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtSubscriptionLevel");
                 scope0.Start();
                 try
                 {
@@ -795,7 +795,7 @@ Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<ManagementLockObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListAtSubscriptionLevel");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListAtSubscriptionLevel");
                 scope0.Start();
                 try
                 {
@@ -824,7 +824,7 @@ public virtual AsyncPageable<ManagementLockObject> ListByScopeAsync(string scope
 
             async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListByScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListByScope");
                 scope0.Start();
                 try
                 {
@@ -839,7 +839,7 @@ async Task<Page<ManagementLockObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ManagementLockObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListByScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListByScope");
                 scope0.Start();
                 try
                 {
@@ -868,7 +868,7 @@ public virtual Pageable<ManagementLockObject> ListByScope(string scope, string f
 
             Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListByScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListByScope");
                 scope0.Start();
                 try
                 {
@@ -883,7 +883,7 @@ Page<ManagementLockObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<ManagementLockObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksClient.ListByScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ManagementLocksOperations.ListByScope");
                 scope0.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksRestOperations.cs
index f2c23105364b0..032d8aac29b0e 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ManagementLocksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ManagementLocksRestClient
+    internal partial class ManagementLocksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ManagementLocksRestClient. </summary>
+        /// <summary> Initializes a new instance of ManagementLocksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ManagementLocksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ManagementLocksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/OperationsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Operations.cs
similarity index 85%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/OperationsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/Operations.cs
index f13330466590e..dc245eaa91d35 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/OperationsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/Operations.cs
@@ -15,23 +15,23 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Operation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<Operation> FirstPageFunc(int? pageSizeHint)
             }
             Page<Operation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsOperations.cs
similarity index 96%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsOperations.cs
index 9e8c3dd0f4938..bbda4f04a002d 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The PolicyAssignments service client. </summary>
-    public partial class PolicyAssignmentsClient
+    public partial class PolicyAssignmentsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PolicyAssignmentsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PolicyAssignmentsClient for mocking. </summary>
-        protected PolicyAssignmentsClient()
+        internal PolicyAssignmentsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PolicyAssignmentsOperations for mocking. </summary>
+        protected PolicyAssignmentsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PolicyAssignmentsClient. </summary>
+        /// <summary> Initializes a new instance of PolicyAssignmentsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PolicyAssignmentsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PolicyAssignmentsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PolicyAssignmentsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PolicyAssignmentsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal PolicyAssignmentsClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyAssignment>> DeleteAsync(string scope, string policyAssignmentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.Delete");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.Delete");
             scope0.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<PolicyAssignment>> DeleteAsync(string scope,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyAssignment> Delete(string scope, string policyAssignmentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.Delete");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.Delete");
             scope0.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<PolicyAssignment> Delete(string scope, string policyAssi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyAssignment>> CreateAsync(string scope, string policyAssignmentName, PolicyAssignment parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.Create");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.Create");
             scope0.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<PolicyAssignment>> CreateAsync(string scope,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyAssignment> Create(string scope, string policyAssignmentName, PolicyAssignment parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.Create");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.Create");
             scope0.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<PolicyAssignment> Create(string scope, string policyAssi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyAssignment>> GetAsync(string scope, string policyAssignmentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.Get");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.Get");
             scope0.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<PolicyAssignment>> GetAsync(string scope, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyAssignment> Get(string scope, string policyAssignmentName, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.Get");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.Get");
             scope0.Start();
             try
             {
@@ -158,7 +158,7 @@ public virtual Response<PolicyAssignment> Get(string scope, string policyAssignm
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyAssignment>> DeleteByIdAsync(string policyAssignmentId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.DeleteById");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.DeleteById");
             scope0.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual async Task<Response<PolicyAssignment>> DeleteByIdAsync(string pol
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyAssignment> DeleteById(string policyAssignmentId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.DeleteById");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.DeleteById");
             scope0.Start();
             try
             {
@@ -195,7 +195,7 @@ public virtual Response<PolicyAssignment> DeleteById(string policyAssignmentId,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyAssignment>> CreateByIdAsync(string policyAssignmentId, PolicyAssignment parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.CreateById");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.CreateById");
             scope0.Start();
             try
             {
@@ -214,7 +214,7 @@ public virtual async Task<Response<PolicyAssignment>> CreateByIdAsync(string pol
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyAssignment> CreateById(string policyAssignmentId, PolicyAssignment parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.CreateById");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.CreateById");
             scope0.Start();
             try
             {
@@ -232,7 +232,7 @@ public virtual Response<PolicyAssignment> CreateById(string policyAssignmentId,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyAssignment>> GetByIdAsync(string policyAssignmentId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.GetById");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.GetById");
             scope0.Start();
             try
             {
@@ -250,7 +250,7 @@ public virtual async Task<Response<PolicyAssignment>> GetByIdAsync(string policy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyAssignment> GetById(string policyAssignmentId, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.GetById");
+            using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.GetById");
             scope0.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual AsyncPageable<PolicyAssignment> ListForResourceGroupAsync(string
 
             async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -291,7 +291,7 @@ async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyAssignment>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -320,7 +320,7 @@ public virtual Pageable<PolicyAssignment> ListForResourceGroup(string resourceGr
 
             Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -335,7 +335,7 @@ Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyAssignment> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResourceGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResourceGroup");
                 scope0.Start();
                 try
                 {
@@ -384,7 +384,7 @@ public virtual AsyncPageable<PolicyAssignment> ListForResourceAsync(string resou
 
             async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResource");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResource");
                 scope0.Start();
                 try
                 {
@@ -399,7 +399,7 @@ async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyAssignment>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResource");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResource");
                 scope0.Start();
                 try
                 {
@@ -448,7 +448,7 @@ public virtual Pageable<PolicyAssignment> ListForResource(string resourceGroupNa
 
             Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResource");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResource");
                 scope0.Start();
                 try
                 {
@@ -463,7 +463,7 @@ Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyAssignment> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForResource");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForResource");
                 scope0.Start();
                 try
                 {
@@ -496,7 +496,7 @@ public virtual AsyncPageable<PolicyAssignment> ListForManagementGroupAsync(strin
 
             async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForManagementGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForManagementGroup");
                 scope0.Start();
                 try
                 {
@@ -511,7 +511,7 @@ async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyAssignment>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForManagementGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForManagementGroup");
                 scope0.Start();
                 try
                 {
@@ -544,7 +544,7 @@ public virtual Pageable<PolicyAssignment> ListForManagementGroup(string manageme
 
             Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForManagementGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForManagementGroup");
                 scope0.Start();
                 try
                 {
@@ -559,7 +559,7 @@ Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyAssignment> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.ListForManagementGroup");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.ListForManagementGroup");
                 scope0.Start();
                 try
                 {
@@ -582,7 +582,7 @@ public virtual AsyncPageable<PolicyAssignment> ListAsync(string filter = null, C
         {
             async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.List");
                 scope0.Start();
                 try
                 {
@@ -597,7 +597,7 @@ async Task<Page<PolicyAssignment>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyAssignment>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.List");
                 scope0.Start();
                 try
                 {
@@ -620,7 +620,7 @@ public virtual Pageable<PolicyAssignment> List(string filter = null, Cancellatio
         {
             Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.List");
                 scope0.Start();
                 try
                 {
@@ -635,7 +635,7 @@ Page<PolicyAssignment> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyAssignment> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("PolicyAssignmentsOperations.List");
                 scope0.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsRestOperations.cs
index ac356dd6f8f0f..3d1b5ca94ba48 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyAssignmentsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class PolicyAssignmentsRestClient
+    internal partial class PolicyAssignmentsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PolicyAssignmentsRestClient. </summary>
+        /// <summary> Initializes a new instance of PolicyAssignmentsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PolicyAssignmentsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PolicyAssignmentsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsOperations.cs
similarity index 93%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsOperations.cs
index 678d040b2f990..ad4702e1c1919 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The PolicyDefinitions service client. </summary>
-    public partial class PolicyDefinitionsClient
+    public partial class PolicyDefinitionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PolicyDefinitionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PolicyDefinitionsClient for mocking. </summary>
-        protected PolicyDefinitionsClient()
+        internal PolicyDefinitionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PolicyDefinitionsOperations for mocking. </summary>
+        protected PolicyDefinitionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PolicyDefinitionsClient. </summary>
+        /// <summary> Initializes a new instance of PolicyDefinitionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PolicyDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PolicyDefinitionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PolicyDefinitionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PolicyDefinitionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal PolicyDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyDefinition>> CreateOrUpdateAsync(string policyDefinitionName, PolicyDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<PolicyDefinition>> CreateOrUpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyDefinition> CreateOrUpdate(string policyDefinitionName, PolicyDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<PolicyDefinition> CreateOrUpdate(string policyDefinition
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string policyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.Delete");
             scope.Start();
             try
             {
@@ -98,7 +98,7 @@ public virtual async Task<Response> DeleteAsync(string policyDefinitionName, Can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string policyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.Delete");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual Response Delete(string policyDefinitionName, CancellationToken ca
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyDefinition>> GetAsync(string policyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -134,7 +134,7 @@ public virtual async Task<Response<PolicyDefinition>> GetAsync(string policyDefi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyDefinition> Get(string policyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual Response<PolicyDefinition> Get(string policyDefinitionName, Cance
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyDefinition>> GetBuiltInAsync(string policyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.GetBuiltIn");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.GetBuiltIn");
             scope.Start();
             try
             {
@@ -170,7 +170,7 @@ public virtual async Task<Response<PolicyDefinition>> GetBuiltInAsync(string pol
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyDefinition> GetBuiltIn(string policyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.GetBuiltIn");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.GetBuiltIn");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual Response<PolicyDefinition> GetBuiltIn(string policyDefinitionName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyDefinition>> CreateOrUpdateAtManagementGroupAsync(string policyDefinitionName, string managementGroupId, PolicyDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.CreateOrUpdateAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.CreateOrUpdateAtManagementGroup");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual async Task<Response<PolicyDefinition>> CreateOrUpdateAtManagement
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyDefinition> CreateOrUpdateAtManagementGroup(string policyDefinitionName, string managementGroupId, PolicyDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.CreateOrUpdateAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.CreateOrUpdateAtManagementGroup");
             scope.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual Response<PolicyDefinition> CreateOrUpdateAtManagementGroup(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAtManagementGroupAsync(string policyDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.DeleteAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.DeleteAtManagementGroup");
             scope.Start();
             try
             {
@@ -248,7 +248,7 @@ public virtual async Task<Response> DeleteAtManagementGroupAsync(string policyDe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAtManagementGroup(string policyDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.DeleteAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.DeleteAtManagementGroup");
             scope.Start();
             try
             {
@@ -267,7 +267,7 @@ public virtual Response DeleteAtManagementGroup(string policyDefinitionName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicyDefinition>> GetAtManagementGroupAsync(string policyDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.GetAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.GetAtManagementGroup");
             scope.Start();
             try
             {
@@ -286,7 +286,7 @@ public virtual async Task<Response<PolicyDefinition>> GetAtManagementGroupAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicyDefinition> GetAtManagementGroup(string policyDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.GetAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.GetAtManagementGroup");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual AsyncPageable<PolicyDefinition> ListAsync(CancellationToken cance
         {
             async Task<Page<PolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -320,7 +320,7 @@ async Task<Page<PolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -342,7 +342,7 @@ public virtual Pageable<PolicyDefinition> List(CancellationToken cancellationTok
         {
             Page<PolicyDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -357,7 +357,7 @@ Page<PolicyDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -379,7 +379,7 @@ public virtual AsyncPageable<PolicyDefinition> ListBuiltInAsync(CancellationToke
         {
             async Task<Page<PolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -394,7 +394,7 @@ async Task<Page<PolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -416,7 +416,7 @@ public virtual Pageable<PolicyDefinition> ListBuiltIn(CancellationToken cancella
         {
             Page<PolicyDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -431,7 +431,7 @@ Page<PolicyDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -459,7 +459,7 @@ public virtual AsyncPageable<PolicyDefinition> ListByManagementGroupAsync(string
 
             async Task<Page<PolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
@@ -474,7 +474,7 @@ async Task<Page<PolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicyDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
@@ -502,7 +502,7 @@ public virtual Pageable<PolicyDefinition> ListByManagementGroup(string managemen
 
             Page<PolicyDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
@@ -517,7 +517,7 @@ Page<PolicyDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicyDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicyDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsRestOperations.cs
index 6e5451d34d55f..1cc5559fa0751 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicyDefinitionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class PolicyDefinitionsRestClient
+    internal partial class PolicyDefinitionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PolicyDefinitionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PolicyDefinitionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PolicyDefinitionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PolicyDefinitionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsOperations.cs
similarity index 93%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsOperations.cs
index 20db60bfb7ee8..b940f3f4e89ca 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The PolicySetDefinitions service client. </summary>
-    public partial class PolicySetDefinitionsClient
+    public partial class PolicySetDefinitionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PolicySetDefinitionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PolicySetDefinitionsClient for mocking. </summary>
-        protected PolicySetDefinitionsClient()
+        internal PolicySetDefinitionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PolicySetDefinitionsOperations for mocking. </summary>
+        protected PolicySetDefinitionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PolicySetDefinitionsClient. </summary>
+        /// <summary> Initializes a new instance of PolicySetDefinitionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PolicySetDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PolicySetDefinitionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PolicySetDefinitionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PolicySetDefinitionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal PolicySetDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicySetDefinition>> CreateOrUpdateAsync(string policySetDefinitionName, PolicySetDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<PolicySetDefinition>> CreateOrUpdateAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicySetDefinition> CreateOrUpdate(string policySetDefinitionName, PolicySetDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<PolicySetDefinition> CreateOrUpdate(string policySetDefi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string policySetDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.Delete");
             scope.Start();
             try
             {
@@ -98,7 +98,7 @@ public virtual async Task<Response> DeleteAsync(string policySetDefinitionName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string policySetDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.Delete");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual Response Delete(string policySetDefinitionName, CancellationToken
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicySetDefinition>> GetAsync(string policySetDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -134,7 +134,7 @@ public virtual async Task<Response<PolicySetDefinition>> GetAsync(string policyS
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicySetDefinition> Get(string policySetDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual Response<PolicySetDefinition> Get(string policySetDefinitionName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicySetDefinition>> GetBuiltInAsync(string policySetDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.GetBuiltIn");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.GetBuiltIn");
             scope.Start();
             try
             {
@@ -170,7 +170,7 @@ public virtual async Task<Response<PolicySetDefinition>> GetBuiltInAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicySetDefinition> GetBuiltIn(string policySetDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.GetBuiltIn");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.GetBuiltIn");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual Response<PolicySetDefinition> GetBuiltIn(string policySetDefiniti
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicySetDefinition>> CreateOrUpdateAtManagementGroupAsync(string policySetDefinitionName, string managementGroupId, PolicySetDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.CreateOrUpdateAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.CreateOrUpdateAtManagementGroup");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual async Task<Response<PolicySetDefinition>> CreateOrUpdateAtManagem
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicySetDefinition> CreateOrUpdateAtManagementGroup(string policySetDefinitionName, string managementGroupId, PolicySetDefinition parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.CreateOrUpdateAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.CreateOrUpdateAtManagementGroup");
             scope.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual Response<PolicySetDefinition> CreateOrUpdateAtManagementGroup(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAtManagementGroupAsync(string policySetDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.DeleteAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.DeleteAtManagementGroup");
             scope.Start();
             try
             {
@@ -248,7 +248,7 @@ public virtual async Task<Response> DeleteAtManagementGroupAsync(string policySe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAtManagementGroup(string policySetDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.DeleteAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.DeleteAtManagementGroup");
             scope.Start();
             try
             {
@@ -267,7 +267,7 @@ public virtual Response DeleteAtManagementGroup(string policySetDefinitionName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PolicySetDefinition>> GetAtManagementGroupAsync(string policySetDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.GetAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.GetAtManagementGroup");
             scope.Start();
             try
             {
@@ -286,7 +286,7 @@ public virtual async Task<Response<PolicySetDefinition>> GetAtManagementGroupAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PolicySetDefinition> GetAtManagementGroup(string policySetDefinitionName, string managementGroupId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.GetAtManagementGroup");
+            using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.GetAtManagementGroup");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual AsyncPageable<PolicySetDefinition> ListAsync(CancellationToken ca
         {
             async Task<Page<PolicySetDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -320,7 +320,7 @@ async Task<Page<PolicySetDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicySetDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -342,7 +342,7 @@ public virtual Pageable<PolicySetDefinition> List(CancellationToken cancellation
         {
             Page<PolicySetDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -357,7 +357,7 @@ Page<PolicySetDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicySetDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -379,7 +379,7 @@ public virtual AsyncPageable<PolicySetDefinition> ListBuiltInAsync(CancellationT
         {
             async Task<Page<PolicySetDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -394,7 +394,7 @@ async Task<Page<PolicySetDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicySetDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -416,7 +416,7 @@ public virtual Pageable<PolicySetDefinition> ListBuiltIn(CancellationToken cance
         {
             Page<PolicySetDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -431,7 +431,7 @@ Page<PolicySetDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicySetDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListBuiltIn");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListBuiltIn");
                 scope.Start();
                 try
                 {
@@ -459,7 +459,7 @@ public virtual AsyncPageable<PolicySetDefinition> ListByManagementGroupAsync(str
 
             async Task<Page<PolicySetDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
@@ -474,7 +474,7 @@ async Task<Page<PolicySetDefinition>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PolicySetDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
@@ -502,7 +502,7 @@ public virtual Pageable<PolicySetDefinition> ListByManagementGroup(string manage
 
             Page<PolicySetDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
@@ -517,7 +517,7 @@ Page<PolicySetDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<PolicySetDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsClient.ListByManagementGroup");
+                using var scope = _clientDiagnostics.CreateScope("PolicySetDefinitionsOperations.ListByManagementGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsRestOperations.cs
index 593c4c6e06e02..08b9f5043e056 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/PolicySetDefinitionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class PolicySetDefinitionsRestClient
+    internal partial class PolicySetDefinitionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PolicySetDefinitionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PolicySetDefinitionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PolicySetDefinitionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PolicySetDefinitionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersOperations.cs
similarity index 93%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersOperations.cs
index 53eb44908b417..e12f98b853731 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Providers service client. </summary>
-    public partial class ProvidersClient
+    public partial class ProvidersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ProvidersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ProvidersClient for mocking. </summary>
-        protected ProvidersClient()
+        internal ProvidersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ProvidersOperations for mocking. </summary>
+        protected ProvidersOperations()
         {
         }
-        /// <summary> Initializes a new instance of ProvidersClient. </summary>
+        /// <summary> Initializes a new instance of ProvidersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ProvidersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ProvidersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ProvidersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal ProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> UnregisterAsync(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Unregister");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Unregister");
             scope.Start();
             try
             {
@@ -60,7 +60,7 @@ public virtual async Task<Response<Provider>> UnregisterAsync(string resourcePro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> Unregister(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Unregister");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Unregister");
             scope.Start();
             try
             {
@@ -78,7 +78,7 @@ public virtual Response<Provider> Unregister(string resourceProviderNamespace, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> RegisterAsync(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Register");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Register");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual async Task<Response<Provider>> RegisterAsync(string resourceProvi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> Register(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Register");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Register");
             scope.Start();
             try
             {
@@ -115,7 +115,7 @@ public virtual Response<Provider> Register(string resourceProviderNamespace, Can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> GetAsync(string resourceProviderNamespace, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -134,7 +134,7 @@ public virtual async Task<Response<Provider>> GetAsync(string resourceProviderNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> Get(string resourceProviderNamespace, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -153,7 +153,7 @@ public virtual Response<Provider> Get(string resourceProviderNamespace, string e
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> GetAtTenantScopeAsync(string resourceProviderNamespace, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.GetAtTenantScope");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.GetAtTenantScope");
             scope.Start();
             try
             {
@@ -172,7 +172,7 @@ public virtual async Task<Response<Provider>> GetAtTenantScopeAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> GetAtTenantScope(string resourceProviderNamespace, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.GetAtTenantScope");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.GetAtTenantScope");
             scope.Start();
             try
             {
@@ -193,7 +193,7 @@ public virtual AsyncPageable<Provider> ListAsync(int? top = null, string expand
         {
             async Task<Page<Provider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -208,7 +208,7 @@ async Task<Page<Provider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Provider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -232,7 +232,7 @@ public virtual Pageable<Provider> List(int? top = null, string expand = null, Ca
         {
             Page<Provider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -247,7 +247,7 @@ Page<Provider> FirstPageFunc(int? pageSizeHint)
             }
             Page<Provider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -271,7 +271,7 @@ public virtual AsyncPageable<Provider> ListAtTenantScopeAsync(int? top = null, s
         {
             async Task<Page<Provider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.ListAtTenantScope");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.ListAtTenantScope");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ async Task<Page<Provider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Provider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.ListAtTenantScope");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.ListAtTenantScope");
                 scope.Start();
                 try
                 {
@@ -310,7 +310,7 @@ public virtual Pageable<Provider> ListAtTenantScope(int? top = null, string expa
         {
             Page<Provider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.ListAtTenantScope");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.ListAtTenantScope");
                 scope.Start();
                 try
                 {
@@ -325,7 +325,7 @@ Page<Provider> FirstPageFunc(int? pageSizeHint)
             }
             Page<Provider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.ListAtTenantScope");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.ListAtTenantScope");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersRestOperations.cs
index 6c3e9d8049d37..acc8e19874a0a 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ProvidersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ProvidersRestClient
+    internal partial class ProvidersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ProvidersRestClient. </summary>
+        /// <summary> Initializes a new instance of ProvidersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ProvidersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ProvidersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsOperations.cs
similarity index 94%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsOperations.cs
index faaf849e9b97d..ecba5e1702b3e 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The ResourceGroups service client. </summary>
-    public partial class ResourceGroupsClient
+    public partial class ResourceGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceGroupsClient for mocking. </summary>
-        protected ResourceGroupsClient()
+        internal ResourceGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceGroupsOperations for mocking. </summary>
+        protected ResourceGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ResourceGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourceGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourceGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourceGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourceGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal ResourceGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -60,7 +60,7 @@ public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistence(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response CheckExistence(string resourceGroupName, CancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroup>> CreateOrUpdateAsync(string resourceGroupName, ResourceGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -98,7 +98,7 @@ public virtual async Task<Response<ResourceGroup>> CreateOrUpdateAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroup> CreateOrUpdate(string resourceGroupName, ResourceGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual Response<ResourceGroup> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroup>> GetAsync(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -134,7 +134,7 @@ public virtual async Task<Response<ResourceGroup>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroup> Get(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -153,7 +153,7 @@ public virtual Response<ResourceGroup> Get(string resourceGroupName, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroup>> UpdateAsync(string resourceGroupName, ResourceGroupPatchable parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -172,7 +172,7 @@ public virtual async Task<Response<ResourceGroup>> UpdateAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroup> Update(string resourceGroupName, ResourceGroupPatchable parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -193,7 +193,7 @@ public virtual AsyncPageable<ResourceGroup> ListAsync(string filter = null, int?
         {
             async Task<Page<ResourceGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -208,7 +208,7 @@ async Task<Page<ResourceGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ResourceGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -232,7 +232,7 @@ public virtual Pageable<ResourceGroup> List(string filter = null, int? top = nul
         {
             Page<ResourceGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -247,7 +247,7 @@ Page<ResourceGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ResourceGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -273,7 +273,7 @@ public virtual async Task<ResourceGroupsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(resourceGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -297,7 +297,7 @@ public virtual ResourceGroupsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(resourceGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -326,7 +326,7 @@ public virtual async Task<ResourceGroupsExportTemplateOperation> StartExportTemp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.StartExportTemplate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.StartExportTemplate");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual ResourceGroupsExportTemplateOperation StartExportTemplate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.StartExportTemplate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.StartExportTemplate");
             scope.Start();
             try
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsRestOperations.cs
index e8bb070b58d5c..9e183ac8fb6c1 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ResourceGroupsRestClient
+    internal partial class ResourceGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourceGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksOperations.cs
similarity index 93%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksOperations.cs
index 43931ceca088c..004ad4ed3a027 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The ResourceLinks service client. </summary>
-    public partial class ResourceLinksClient
+    public partial class ResourceLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceLinksClient for mocking. </summary>
-        protected ResourceLinksClient()
+        internal ResourceLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceLinksOperations for mocking. </summary>
+        protected ResourceLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceLinksClient. </summary>
+        /// <summary> Initializes a new instance of ResourceLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourceLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourceLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourceLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourceLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal ResourceLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string linkId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.Delete");
             scope.Start();
             try
             {
@@ -60,7 +60,7 @@ public virtual async Task<Response> DeleteAsync(string linkId, CancellationToken
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string linkId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.Delete");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response Delete(string linkId, CancellationToken cancellationToke
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceLink>> CreateOrUpdateAsync(string linkId, ResourceLink parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -98,7 +98,7 @@ public virtual async Task<Response<ResourceLink>> CreateOrUpdateAsync(string lin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceLink> CreateOrUpdate(string linkId, ResourceLink parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual Response<ResourceLink> CreateOrUpdate(string linkId, ResourceLink
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceLink>> GetAsync(string linkId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.Get");
             scope.Start();
             try
             {
@@ -134,7 +134,7 @@ public virtual async Task<Response<ResourceLink>> GetAsync(string linkId, Cancel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceLink> Get(string linkId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.Get");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual AsyncPageable<ResourceLink> ListAtSubscriptionAsync(string filter
         {
             async Task<Page<ResourceLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSubscription");
+                using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSubscription");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ async Task<Page<ResourceLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ResourceLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSubscription");
+                using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSubscription");
                 scope.Start();
                 try
                 {
@@ -192,7 +192,7 @@ public virtual Pageable<ResourceLink> ListAtSubscription(string filter = null, C
         {
             Page<ResourceLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSubscription");
+                using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSubscription");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ Page<ResourceLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<ResourceLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSubscription");
+                using var scope = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSubscription");
                 scope.Start();
                 try
                 {
@@ -235,7 +235,7 @@ public virtual AsyncPageable<ResourceLink> ListAtSourceScopeAsync(string scope,
 
             async Task<Page<ResourceLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSourceScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSourceScope");
                 scope0.Start();
                 try
                 {
@@ -250,7 +250,7 @@ async Task<Page<ResourceLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ResourceLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSourceScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSourceScope");
                 scope0.Start();
                 try
                 {
@@ -278,7 +278,7 @@ public virtual Pageable<ResourceLink> ListAtSourceScope(string scope, Cancellati
 
             Page<ResourceLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSourceScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSourceScope");
                 scope0.Start();
                 try
                 {
@@ -293,7 +293,7 @@ Page<ResourceLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<ResourceLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksClient.ListAtSourceScope");
+                using var scope0 = _clientDiagnostics.CreateScope("ResourceLinksOperations.ListAtSourceScope");
                 scope0.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksRestOperations.cs
index 9ada4bf1a669e..2e4b4c79bf815 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourceLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ResourceLinksRestClient
+    internal partial class ResourceLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourceLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesManagementClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesManagementClient.cs
index 6b78197a55dc4..84dd095090d9b 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesManagementClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesManagementClient.cs
@@ -53,124 +53,64 @@ public ResourcesManagementClient(Uri endpoint, string subscriptionId, TokenCrede
             _subscriptionId = subscriptionId;
         }
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of DeploymentsClient. </summary>
-        public virtual DeploymentsClient GetDeploymentsClient()
-        {
-            return new DeploymentsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DeploymentsOperations. </summary>
+        public virtual DeploymentsOperations Deployments => new DeploymentsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ProvidersClient. </summary>
-        public virtual ProvidersClient GetProvidersClient()
-        {
-            return new ProvidersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ProvidersOperations. </summary>
+        public virtual ProvidersOperations Providers => new ProvidersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourcesClient. </summary>
-        public virtual ResourcesClient GetResourcesClient()
-        {
-            return new ResourcesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourcesOperations. </summary>
+        public virtual ResourcesOperations Resources => new ResourcesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceGroupsClient. </summary>
-        public virtual ResourceGroupsClient GetResourceGroupsClient()
-        {
-            return new ResourceGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceGroupsOperations. </summary>
+        public virtual ResourceGroupsOperations ResourceGroups => new ResourceGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of TagsClient. </summary>
-        public virtual TagsClient GetTagsClient()
-        {
-            return new TagsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of TagsOperations. </summary>
+        public virtual TagsOperations Tags => new TagsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DeploymentClient. </summary>
-        public virtual DeploymentClient GetDeploymentClient()
-        {
-            return new DeploymentClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DeploymentOperations. </summary>
+        public virtual DeploymentOperations Deployment => new DeploymentOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SubscriptionsClient. </summary>
-        public virtual SubscriptionsClient GetSubscriptionsClient()
-        {
-            return new SubscriptionsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of SubscriptionsOperations. </summary>
+        public virtual SubscriptionsOperations Subscriptions => new SubscriptionsOperations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of TenantsClient. </summary>
-        public virtual TenantsClient GetTenantsClient()
-        {
-            return new TenantsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of TenantsOperations. </summary>
+        public virtual TenantsOperations Tenants => new TenantsOperations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of PolicyAssignmentsClient. </summary>
-        public virtual PolicyAssignmentsClient GetPolicyAssignmentsClient()
-        {
-            return new PolicyAssignmentsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PolicyAssignmentsOperations. </summary>
+        public virtual PolicyAssignmentsOperations PolicyAssignments => new PolicyAssignmentsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PolicyDefinitionsClient. </summary>
-        public virtual PolicyDefinitionsClient GetPolicyDefinitionsClient()
-        {
-            return new PolicyDefinitionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PolicyDefinitionsOperations. </summary>
+        public virtual PolicyDefinitionsOperations PolicyDefinitions => new PolicyDefinitionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PolicySetDefinitionsClient. </summary>
-        public virtual PolicySetDefinitionsClient GetPolicySetDefinitionsClient()
-        {
-            return new PolicySetDefinitionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PolicySetDefinitionsOperations. </summary>
+        public virtual PolicySetDefinitionsOperations PolicySetDefinitions => new PolicySetDefinitionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DeploymentScriptsClient. </summary>
-        public virtual DeploymentScriptsClient GetDeploymentScriptsClient()
-        {
-            return new DeploymentScriptsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DeploymentScriptsOperations. </summary>
+        public virtual DeploymentScriptsOperations DeploymentScripts => new DeploymentScriptsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceClient. </summary>
-        public virtual ServiceClient GetServiceClient()
-        {
-            return new ServiceClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceOperations. </summary>
+        public virtual ServiceOperations Service => new ServiceOperations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of FeaturesClient. </summary>
-        public virtual FeaturesClient GetFeaturesClient()
-        {
-            return new FeaturesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FeaturesOperations. </summary>
+        public virtual FeaturesOperations Features => new FeaturesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AuthorizationClient. </summary>
-        public virtual AuthorizationClient GetAuthorizationClient()
-        {
-            return new AuthorizationClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of AuthorizationOperations. </summary>
+        public virtual AuthorizationOperations Authorization => new AuthorizationOperations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of ManagementLocksClient. </summary>
-        public virtual ManagementLocksClient GetManagementLocksClient()
-        {
-            return new ManagementLocksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ManagementLocksOperations. </summary>
+        public virtual ManagementLocksOperations ManagementLocks => new ManagementLocksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceLinksClient. </summary>
-        public virtual ResourceLinksClient GetResourceLinksClient()
-        {
-            return new ResourceLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceLinksOperations. </summary>
+        public virtual ResourceLinksOperations ResourceLinks => new ResourceLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ApplicationsClient. </summary>
-        public virtual ApplicationsClient GetApplicationsClient()
-        {
-            return new ApplicationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationsOperations. </summary>
+        public virtual ApplicationsOperations Applications => new ApplicationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ApplicationDefinitionsClient. </summary>
-        public virtual ApplicationDefinitionsClient GetApplicationDefinitionsClient()
-        {
-            return new ApplicationDefinitionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationDefinitionsOperations. </summary>
+        public virtual ApplicationDefinitionsOperations ApplicationDefinitions => new ApplicationDefinitionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesOperations.cs
similarity index 97%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesOperations.cs
index b0e83451b0a43..15799b27ffd27 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Resources service client. </summary>
-    public partial class ResourcesClient
+    public partial class ResourcesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourcesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourcesClient for mocking. </summary>
-        protected ResourcesClient()
+        internal ResourcesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourcesOperations for mocking. </summary>
+        protected ResourcesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourcesClient. </summary>
+        /// <summary> Initializes a new instance of ResourcesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourcesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourcesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourcesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -47,7 +47,7 @@ internal ResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -70,7 +70,7 @@ public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistence(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -93,7 +93,7 @@ public virtual Response CheckExistence(string resourceGroupName, string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GenericResource>> GetAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.Get");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual async Task<Response<GenericResource>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GenericResource> Get(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.Get");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual Response<GenericResource> Get(string resourceGroupName, string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceByIdAsync(string resourceId, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistenceById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistenceById");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual async Task<Response> CheckExistenceByIdAsync(string resourceId, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistenceById(string resourceId, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistenceById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistenceById");
             scope.Start();
             try
             {
@@ -173,7 +173,7 @@ public virtual Response CheckExistenceById(string resourceId, string apiVersion,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GenericResource>> GetByIdAsync(string resourceId, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.GetById");
             scope.Start();
             try
             {
@@ -192,7 +192,7 @@ public virtual async Task<Response<GenericResource>> GetByIdAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GenericResource> GetById(string resourceId, string apiVersion, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.GetById");
             scope.Start();
             try
             {
@@ -220,7 +220,7 @@ public virtual AsyncPageable<GenericResourceExpanded> ListByResourceGroupAsync(s
 
             async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -235,7 +235,7 @@ async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GenericResourceExpanded>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -266,7 +266,7 @@ public virtual Pageable<GenericResourceExpanded> ListByResourceGroup(string reso
 
             Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -281,7 +281,7 @@ Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             }
             Page<GenericResourceExpanded> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -306,7 +306,7 @@ public virtual AsyncPageable<GenericResourceExpanded> ListAsync(string filter =
         {
             async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -321,7 +321,7 @@ async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GenericResourceExpanded>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -346,7 +346,7 @@ public virtual Pageable<GenericResourceExpanded> List(string filter = null, stri
         {
             Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -361,7 +361,7 @@ Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             }
             Page<GenericResourceExpanded> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -392,7 +392,7 @@ public virtual async Task<ResourcesMoveResourcesOperation> StartMoveResourcesAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartMoveResources");
             scope.Start();
             try
             {
@@ -421,7 +421,7 @@ public virtual ResourcesMoveResourcesOperation StartMoveResources(string sourceR
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartMoveResources");
             scope.Start();
             try
             {
@@ -450,7 +450,7 @@ public virtual async Task<ResourcesValidateMoveResourcesOperation> StartValidate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartValidateMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartValidateMoveResources");
             scope.Start();
             try
             {
@@ -479,7 +479,7 @@ public virtual ResourcesValidateMoveResourcesOperation StartValidateMoveResource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartValidateMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartValidateMoveResources");
             scope.Start();
             try
             {
@@ -528,7 +528,7 @@ public virtual async Task<ResourcesDeleteOperation> StartDeleteAsync(string reso
                 throw new ArgumentNullException(nameof(apiVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -577,7 +577,7 @@ public virtual ResourcesDeleteOperation StartDelete(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(apiVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -631,7 +631,7 @@ public virtual async Task<ResourcesCreateOrUpdateOperation> StartCreateOrUpdateA
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -685,7 +685,7 @@ public virtual ResourcesCreateOrUpdateOperation StartCreateOrUpdate(string resou
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -739,7 +739,7 @@ public virtual async Task<ResourcesUpdateOperation> StartUpdateAsync(string reso
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -793,7 +793,7 @@ public virtual ResourcesUpdateOperation StartUpdate(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -822,7 +822,7 @@ public virtual async Task<ResourcesDeleteByIdOperation> StartDeleteByIdAsync(str
                 throw new ArgumentNullException(nameof(apiVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -851,7 +851,7 @@ public virtual ResourcesDeleteByIdOperation StartDeleteById(string resourceId, s
                 throw new ArgumentNullException(nameof(apiVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -885,7 +885,7 @@ public virtual async Task<ResourcesCreateOrUpdateByIdOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
@@ -919,7 +919,7 @@ public virtual ResourcesCreateOrUpdateByIdOperation StartCreateOrUpdateById(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
@@ -953,7 +953,7 @@ public virtual async Task<ResourcesUpdateByIdOperation> StartUpdateByIdAsync(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdateById");
             scope.Start();
             try
             {
@@ -987,7 +987,7 @@ public virtual ResourcesUpdateByIdOperation StartUpdateById(string resourceId, s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdateById");
             scope.Start();
             try
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesRestOperations.cs
index eb78a4ef3bf57..873f078226f76 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ResourcesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ResourcesRestClient
+    internal partial class ResourcesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourcesRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourcesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourcesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/OperationsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/RestOperations.cs
similarity index 96%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/OperationsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/RestOperations.cs
index 95ca16bd57075..9173eff305923 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/OperationsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/RestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceOperations.cs
similarity index 86%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceOperations.cs
index 06e2bf312de00..6ad642d44bfad 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceOperations.cs
@@ -16,22 +16,22 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Service service client. </summary>
-    public partial class ServiceClient
+    public partial class ServiceOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceClient for mocking. </summary>
-        protected ServiceClient()
+        internal ServiceRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceOperations for mocking. </summary>
+        protected ServiceOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceClient. </summary>
+        /// <summary> Initializes a new instance of ServiceOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal ServiceOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new ServiceRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new ServiceRestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<OperationAutoGenerated> ListOperationsAsync(Cancell
         {
             async Task<Page<OperationAutoGenerated>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.ListOperations");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.ListOperations");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<OperationAutoGenerated>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OperationAutoGenerated>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.ListOperations");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.ListOperations");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<OperationAutoGenerated> ListOperations(CancellationToken
         {
             Page<OperationAutoGenerated> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.ListOperations");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.ListOperations");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<OperationAutoGenerated> FirstPageFunc(int? pageSizeHint)
             }
             Page<OperationAutoGenerated> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.ListOperations");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.ListOperations");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceRestOperations.cs
similarity index 96%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceRestOperations.cs
index 1ba664ee62469..14143f3c2191d 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/ServiceRestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class ServiceRestClient
+    internal partial class ServiceRestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public ServiceRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public ServiceRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsOperations.cs
similarity index 92%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsOperations.cs
index b1e5604aac078..ec48451e3057e 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsOperations.cs
@@ -16,22 +16,22 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Subscriptions service client. </summary>
-    public partial class SubscriptionsClient
+    public partial class SubscriptionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SubscriptionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SubscriptionsClient for mocking. </summary>
-        protected SubscriptionsClient()
+        internal SubscriptionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SubscriptionsOperations for mocking. </summary>
+        protected SubscriptionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of SubscriptionsClient. </summary>
+        /// <summary> Initializes a new instance of SubscriptionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SubscriptionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal SubscriptionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new SubscriptionsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new SubscriptionsRestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -41,7 +41,7 @@ internal SubscriptionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Subscription>> GetAsync(string subscriptionId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.Get");
             scope.Start();
             try
             {
@@ -59,7 +59,7 @@ public virtual async Task<Response<Subscription>> GetAsync(string subscriptionId
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Subscription> Get(string subscriptionId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual AsyncPageable<Location> ListLocationsAsync(string subscriptionId,
 
             async Task<Page<Location>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.ListLocations");
+                using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.ListLocations");
                 scope.Start();
                 try
                 {
@@ -112,7 +112,7 @@ public virtual Pageable<Location> ListLocations(string subscriptionId, Cancellat
 
             Page<Location> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.ListLocations");
+                using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.ListLocations");
                 scope.Start();
                 try
                 {
@@ -134,7 +134,7 @@ public virtual AsyncPageable<Subscription> ListAsync(CancellationToken cancellat
         {
             async Task<Page<Subscription>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -149,7 +149,7 @@ async Task<Page<Subscription>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Subscription>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -171,7 +171,7 @@ public virtual Pageable<Subscription> List(CancellationToken cancellationToken =
         {
             Page<Subscription> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -186,7 +186,7 @@ Page<Subscription> FirstPageFunc(int? pageSizeHint)
             }
             Page<Subscription> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubscriptionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubscriptionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsRestOperations.cs
similarity index 98%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsRestOperations.cs
index d8e56eacfd01d..d472f2463804d 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/SubscriptionsRestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class SubscriptionsRestClient
+    internal partial class SubscriptionsRestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SubscriptionsRestClient. </summary>
+        /// <summary> Initializes a new instance of SubscriptionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public SubscriptionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public SubscriptionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsOperations.cs
similarity index 94%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsOperations.cs
index ca2768b5870fd..bd579eaba1ed1 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Tags service client. </summary>
-    public partial class TagsClient
+    public partial class TagsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TagsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TagsClient for mocking. </summary>
-        protected TagsClient()
+        internal TagsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TagsOperations for mocking. </summary>
+        protected TagsOperations()
         {
         }
-        /// <summary> Initializes a new instance of TagsClient. </summary>
+        /// <summary> Initializes a new instance of TagsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal TagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal TagsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new TagsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new TagsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal TagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteValueAsync(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.DeleteValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.DeleteValue");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response> DeleteValueAsync(string tagName, string tagV
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteValue(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.DeleteValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.DeleteValue");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response DeleteValue(string tagName, string tagValue, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagValue>> CreateOrUpdateValueAsync(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdateValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdateValue");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<TagValue>> CreateOrUpdateValueAsync(string ta
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagValue> CreateOrUpdateValue(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdateValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdateValue");
             scope.Start();
             try
             {
@@ -118,7 +118,7 @@ public virtual Response<TagValue> CreateOrUpdateValue(string tagName, string tag
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagDetails>> CreateOrUpdateAsync(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -136,7 +136,7 @@ public virtual async Task<Response<TagDetails>> CreateOrUpdateAsync(string tagNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagDetails> CreateOrUpdate(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual Response<TagDetails> CreateOrUpdate(string tagName, CancellationT
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.Delete");
             scope.Start();
             try
             {
@@ -172,7 +172,7 @@ public virtual async Task<Response> DeleteAsync(string tagName, CancellationToke
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.Delete");
             scope.Start();
             try
             {
@@ -191,7 +191,7 @@ public virtual Response Delete(string tagName, CancellationToken cancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagsResource>> CreateOrUpdateAtScopeAsync(string scope, TagsResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdateAtScope");
             scope0.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual async Task<Response<TagsResource>> CreateOrUpdateAtScopeAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagsResource> CreateOrUpdateAtScope(string scope, TagsResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdateAtScope");
             scope0.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual Response<TagsResource> CreateOrUpdateAtScope(string scope, TagsRe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagsResource>> UpdateAtScopeAsync(string scope, TagsPatchResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.UpdateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.UpdateAtScope");
             scope0.Start();
             try
             {
@@ -248,7 +248,7 @@ public virtual async Task<Response<TagsResource>> UpdateAtScopeAsync(string scop
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagsResource> UpdateAtScope(string scope, TagsPatchResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.UpdateAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.UpdateAtScope");
             scope0.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual Response<TagsResource> UpdateAtScope(string scope, TagsPatchResou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagsResource>> GetAtScopeAsync(string scope, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.GetAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.GetAtScope");
             scope0.Start();
             try
             {
@@ -284,7 +284,7 @@ public virtual async Task<Response<TagsResource>> GetAtScopeAsync(string scope,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagsResource> GetAtScope(string scope, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.GetAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.GetAtScope");
             scope0.Start();
             try
             {
@@ -302,7 +302,7 @@ public virtual Response<TagsResource> GetAtScope(string scope, CancellationToken
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAtScopeAsync(string scope, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.DeleteAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.DeleteAtScope");
             scope0.Start();
             try
             {
@@ -320,7 +320,7 @@ public virtual async Task<Response> DeleteAtScopeAsync(string scope, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteAtScope(string scope, CancellationToken cancellationToken = default)
         {
-            using var scope0 = _clientDiagnostics.CreateScope("TagsClient.DeleteAtScope");
+            using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.DeleteAtScope");
             scope0.Start();
             try
             {
@@ -339,7 +339,7 @@ public virtual AsyncPageable<TagDetails> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<TagDetails>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope0.Start();
                 try
                 {
@@ -354,7 +354,7 @@ async Task<Page<TagDetails>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<TagDetails>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope0.Start();
                 try
                 {
@@ -376,7 +376,7 @@ public virtual Pageable<TagDetails> List(CancellationToken cancellationToken = d
         {
             Page<TagDetails> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope0.Start();
                 try
                 {
@@ -391,7 +391,7 @@ Page<TagDetails> FirstPageFunc(int? pageSizeHint)
             }
             Page<TagDetails> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope0 = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope0 = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope0.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsRestOperations.cs
similarity index 99%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsRestOperations.cs
index 102d69b674536..26b051470f75d 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TagsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class TagsRestClient
+    internal partial class TagsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TagsRestClient. </summary>
+        /// <summary> Initializes a new instance of TagsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public TagsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public TagsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsOperations.cs
similarity index 86%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsOperations.cs
index 5e2a08f4c166d..ded0d9c294982 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsOperations.cs
@@ -16,22 +16,22 @@
 namespace Azure.ResourceManager.Resources
 {
     /// <summary> The Tenants service client. </summary>
-    public partial class TenantsClient
+    public partial class TenantsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TenantsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TenantsClient for mocking. </summary>
-        protected TenantsClient()
+        internal TenantsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TenantsOperations for mocking. </summary>
+        protected TenantsOperations()
         {
         }
-        /// <summary> Initializes a new instance of TenantsClient. </summary>
+        /// <summary> Initializes a new instance of TenantsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal TenantsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal TenantsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new TenantsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new TenantsRestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<TenantIdDescription> ListAsync(CancellationToken ca
         {
             async Task<Page<TenantIdDescription>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TenantsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TenantsOperations.List");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<TenantIdDescription>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<TenantIdDescription>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TenantsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TenantsOperations.List");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<TenantIdDescription> List(CancellationToken cancellation
         {
             Page<TenantIdDescription> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TenantsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TenantsOperations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<TenantIdDescription> FirstPageFunc(int? pageSizeHint)
             }
             Page<TenantIdDescription> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TenantsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TenantsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsRestClient.cs b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsRestOperations.cs
similarity index 96%
rename from sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsRestClient.cs
rename to sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsRestOperations.cs
index 9c99e885e9e2e..0253f811d778d 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsRestClient.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/src/Generated/TenantsRestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.ResourceManager.Resources
 {
-    internal partial class TenantsRestClient
+    internal partial class TenantsRestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TenantsRestClient. </summary>
+        /// <summary> Initializes a new instance of TenantsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public TenantsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public TenantsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersOperations.cs
similarity index 96%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersOperations.cs
index 87854cafe81e4..fe5be2a24671b 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The BlobContainers service client. </summary>
-    public partial class BlobContainersClient
+    public partial class BlobContainersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BlobContainersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BlobContainersClient for mocking. </summary>
-        protected BlobContainersClient()
+        internal BlobContainersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BlobContainersOperations for mocking. </summary>
+        protected BlobContainersOperations()
         {
         }
-        /// <summary> Initializes a new instance of BlobContainersClient. </summary>
+        /// <summary> Initializes a new instance of BlobContainersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal BlobContainersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal BlobContainersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new BlobContainersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new BlobContainersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal BlobContainersClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobContainer>> CreateAsync(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Create");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<BlobContainer>> CreateAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobContainer> Create(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Create");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<BlobContainer> Create(string resourceGroupName, string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobContainer>> UpdateAsync(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Update");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<BlobContainer>> UpdateAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobContainer> Update(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Update");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<BlobContainer> Update(string resourceGroupName, string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobContainer>> GetAsync(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<BlobContainer>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobContainer> Get(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Get");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<BlobContainer> Get(string resourceGroupName, string acco
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Delete");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Delete");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response Delete(string resourceGroupName, string accountName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LegalHold>> SetLegalHoldAsync(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.SetLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.SetLegalHold");
             scope.Start();
             try
             {
@@ -231,7 +231,7 @@ public virtual async Task<Response<LegalHold>> SetLegalHoldAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LegalHold> SetLegalHold(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.SetLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.SetLegalHold");
             scope.Start();
             try
             {
@@ -252,7 +252,7 @@ public virtual Response<LegalHold> SetLegalHold(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LegalHold>> ClearLegalHoldAsync(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ClearLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ClearLegalHold");
             scope.Start();
             try
             {
@@ -273,7 +273,7 @@ public virtual async Task<Response<LegalHold>> ClearLegalHoldAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LegalHold> ClearLegalHold(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ClearLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ClearLegalHold");
             scope.Start();
             try
             {
@@ -295,7 +295,7 @@ public virtual Response<LegalHold> ClearLegalHold(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> CreateOrUpdateImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch = null, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.CreateOrUpdateImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.CreateOrUpdateImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> CreateOrUpdateImmutabili
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> CreateOrUpdateImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch = null, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.CreateOrUpdateImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.CreateOrUpdateImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -338,7 +338,7 @@ public virtual Response<ImmutabilityPolicy> CreateOrUpdateImmutabilityPolicy(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> GetImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.GetImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.GetImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -359,7 +359,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> GetImmutabilityPolicyAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> GetImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.GetImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.GetImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -380,7 +380,7 @@ public virtual Response<ImmutabilityPolicy> GetImmutabilityPolicy(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> DeleteImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.DeleteImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.DeleteImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -401,7 +401,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> DeleteImmutabilityPolicy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> DeleteImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.DeleteImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.DeleteImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -422,7 +422,7 @@ public virtual Response<ImmutabilityPolicy> DeleteImmutabilityPolicy(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> LockImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.LockImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.LockImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -443,7 +443,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> LockImmutabilityPolicyAs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> LockImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.LockImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.LockImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -465,7 +465,7 @@ public virtual Response<ImmutabilityPolicy> LockImmutabilityPolicy(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> ExtendImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ExtendImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ExtendImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -487,7 +487,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> ExtendImmutabilityPolicy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> ExtendImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ExtendImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ExtendImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -508,7 +508,7 @@ public virtual Response<ImmutabilityPolicy> ExtendImmutabilityPolicy(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LeaseContainerResponse>> LeaseAsync(string resourceGroupName, string accountName, string containerName, LeaseContainerRequest parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Lease");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Lease");
             scope.Start();
             try
             {
@@ -529,7 +529,7 @@ public virtual async Task<Response<LeaseContainerResponse>> LeaseAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LeaseContainerResponse> Lease(string resourceGroupName, string accountName, string containerName, LeaseContainerRequest parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Lease");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Lease");
             scope.Start();
             try
             {
@@ -561,7 +561,7 @@ public virtual AsyncPageable<ListContainerItem> ListAsync(string resourceGroupNa
 
             async Task<Page<ListContainerItem>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
@@ -576,7 +576,7 @@ async Task<Page<ListContainerItem>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ListContainerItem>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
@@ -611,7 +611,7 @@ public virtual Pageable<ListContainerItem> List(string resourceGroupName, string
 
             Page<ListContainerItem> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
@@ -626,7 +626,7 @@ Page<ListContainerItem> FirstPageFunc(int? pageSizeHint)
             }
             Page<ListContainerItem> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersRestOperations.cs
similarity index 99%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersRestOperations.cs
index 7c853e43af681..e0c015942c9e7 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobContainersRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class BlobContainersRestClient
+    internal partial class BlobContainersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class BlobContainersRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BlobContainersRestClient. </summary>
+        /// <summary> Initializes a new instance of BlobContainersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BlobContainersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public BlobContainersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesOperations.cs
similarity index 92%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesOperations.cs
index 9e72817b0831f..bcddc4fd21852 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The BlobServices service client. </summary>
-    public partial class BlobServicesClient
+    public partial class BlobServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BlobServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BlobServicesClient for mocking. </summary>
-        protected BlobServicesClient()
+        internal BlobServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BlobServicesOperations for mocking. </summary>
+        protected BlobServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of BlobServicesClient. </summary>
+        /// <summary> Initializes a new instance of BlobServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal BlobServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal BlobServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new BlobServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new BlobServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal BlobServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, BlobServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<BlobServiceProperties>> SetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, BlobServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<BlobServiceProperties> SetServiceProperties(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -103,7 +103,7 @@ public virtual async Task<Response<BlobServiceProperties>> GetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -133,7 +133,7 @@ public virtual AsyncPageable<BlobServiceProperties> ListAsync(string resourceGro
 
             async Task<Page<BlobServiceProperties>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -166,7 +166,7 @@ public virtual Pageable<BlobServiceProperties> List(string resourceGroupName, st
 
             Page<BlobServiceProperties> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesRestOperations.cs
index fec2ad59e437f..e7a08478d115d 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/BlobServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class BlobServicesRestClient
+    internal partial class BlobServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class BlobServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BlobServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of BlobServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BlobServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public BlobServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesOperations.cs
similarity index 94%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesOperations.cs
index 3f4ee01fb5d0a..11c6bf317dbb6 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The EncryptionScopes service client. </summary>
-    public partial class EncryptionScopesClient
+    public partial class EncryptionScopesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal EncryptionScopesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of EncryptionScopesClient for mocking. </summary>
-        protected EncryptionScopesClient()
+        internal EncryptionScopesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of EncryptionScopesOperations for mocking. </summary>
+        protected EncryptionScopesOperations()
         {
         }
-        /// <summary> Initializes a new instance of EncryptionScopesClient. </summary>
+        /// <summary> Initializes a new instance of EncryptionScopesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal EncryptionScopesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal EncryptionScopesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new EncryptionScopesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new EncryptionScopesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal EncryptionScopesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EncryptionScope>> PutAsync(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Put");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<EncryptionScope>> PutAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EncryptionScope> Put(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Put");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<EncryptionScope> Put(string resourceGroupName, string ac
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EncryptionScope>> PatchAsync(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Patch");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<EncryptionScope>> PatchAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EncryptionScope> Patch(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Patch");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<EncryptionScope> Patch(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EncryptionScope>> GetAsync(string resourceGroupName, string accountName, string encryptionScopeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<EncryptionScope>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EncryptionScope> Get(string resourceGroupName, string accountName, string encryptionScopeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Get");
             scope.Start();
             try
             {
@@ -179,7 +179,7 @@ public virtual AsyncPageable<EncryptionScope> ListAsync(string resourceGroupName
 
             async Task<Page<EncryptionScope>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
@@ -194,7 +194,7 @@ async Task<Page<EncryptionScope>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<EncryptionScope>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
@@ -227,7 +227,7 @@ public virtual Pageable<EncryptionScope> List(string resourceGroupName, string a
 
             Page<EncryptionScope> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
@@ -242,7 +242,7 @@ Page<EncryptionScope> FirstPageFunc(int? pageSizeHint)
             }
             Page<EncryptionScope> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesRestOperations.cs
similarity index 99%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesRestOperations.cs
index 0c30cb6ea5042..63420089bba9c 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/EncryptionScopesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class EncryptionScopesRestClient
+    internal partial class EncryptionScopesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class EncryptionScopesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of EncryptionScopesRestClient. </summary>
+        /// <summary> Initializes a new instance of EncryptionScopesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public EncryptionScopesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public EncryptionScopesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesOperations.cs
similarity index 91%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesOperations.cs
index c818453707f11..5fb23ff158222 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The FileServices service client. </summary>
-    public partial class FileServicesClient
+    public partial class FileServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FileServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FileServicesClient for mocking. </summary>
-        protected FileServicesClient()
+        internal FileServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FileServicesOperations for mocking. </summary>
+        protected FileServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FileServicesClient. </summary>
+        /// <summary> Initializes a new instance of FileServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal FileServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal FileServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new FileServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new FileServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal FileServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileServiceItems>> ListAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.List");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<FileServiceItems>> ListAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileServiceItems> List(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.List");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<FileServiceItems> List(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, FileServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<FileServiceProperties>> SetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, FileServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<FileServiceProperties> SetServiceProperties(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<FileServiceProperties>> GetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesRestOperations.cs
index 54828aed0ef17..feb8c29c7e57c 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class FileServicesRestClient
+    internal partial class FileServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class FileServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FileServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of FileServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FileServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public FileServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesOperations.cs
similarity index 95%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesOperations.cs
index 485b8060669e2..fe6e69ac3059a 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The FileShares service client. </summary>
-    public partial class FileSharesClient
+    public partial class FileSharesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FileSharesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FileSharesClient for mocking. </summary>
-        protected FileSharesClient()
+        internal FileSharesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FileSharesOperations for mocking. </summary>
+        protected FileSharesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FileSharesClient. </summary>
+        /// <summary> Initializes a new instance of FileSharesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal FileSharesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal FileSharesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new FileSharesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new FileSharesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal FileSharesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileShare>> CreateAsync(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Create");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<FileShare>> CreateAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileShare> Create(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Create");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<FileShare> Create(string resourceGroupName, string accou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileShare>> UpdateAsync(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Update");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<FileShare>> UpdateAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileShare> Update(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Update");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<FileShare> Update(string resourceGroupName, string accou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileShare>> GetAsync(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<FileShare>> GetAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileShare> Get(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Get");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<FileShare> Get(string resourceGroupName, string accountN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Delete");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Delete");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response Delete(string resourceGroupName, string accountName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RestoreAsync(string resourceGroupName, string accountName, string shareName, DeletedShare deletedShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Restore");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Restore");
             scope.Start();
             try
             {
@@ -231,7 +231,7 @@ public virtual async Task<Response> RestoreAsync(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Restore(string resourceGroupName, string accountName, string shareName, DeletedShare deletedShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Restore");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Restore");
             scope.Start();
             try
             {
@@ -263,7 +263,7 @@ public virtual AsyncPageable<FileShareItem> ListAsync(string resourceGroupName,
 
             async Task<Page<FileShareItem>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
@@ -278,7 +278,7 @@ async Task<Page<FileShareItem>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FileShareItem>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
@@ -313,7 +313,7 @@ public virtual Pageable<FileShareItem> List(string resourceGroupName, string acc
 
             Page<FileShareItem> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
@@ -328,7 +328,7 @@ Page<FileShareItem> FirstPageFunc(int? pageSizeHint)
             }
             Page<FileShareItem> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesRestOperations.cs
similarity index 99%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesRestOperations.cs
index 48a86fbf56a5f..217e53de8cfd4 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/FileSharesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class FileSharesRestClient
+    internal partial class FileSharesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class FileSharesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FileSharesRestClient. </summary>
+        /// <summary> Initializes a new instance of FileSharesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FileSharesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public FileSharesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesOperations.cs
similarity index 91%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesOperations.cs
index 5a1e8a03872ae..7078ecfa2b5f3 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The ManagementPolicies service client. </summary>
-    public partial class ManagementPoliciesClient
+    public partial class ManagementPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ManagementPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ManagementPoliciesClient for mocking. </summary>
-        protected ManagementPoliciesClient()
+        internal ManagementPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ManagementPoliciesOperations for mocking. </summary>
+        protected ManagementPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ManagementPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of ManagementPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ManagementPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal ManagementPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new ManagementPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ManagementPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ManagementPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementPolicy>> GetAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ManagementPolicy>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementPolicy> Get(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ManagementPolicy> Get(string resourceGroupName, string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, ManagementPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ManagementPolicy>> CreateOrUpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementPolicy> CreateOrUpdate(string resourceGroupName, string accountName, ManagementPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<ManagementPolicy> CreateOrUpdate(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Delete");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Delete");
             scope.Start();
             try
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesRestOperations.cs
index 52bfa3d6e5798..839ac64d5d2ef 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ManagementPoliciesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class ManagementPoliciesRestClient
+    internal partial class ManagementPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ManagementPoliciesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ManagementPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of ManagementPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ManagementPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public ManagementPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesOperations.cs
similarity index 93%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesOperations.cs
index 92a348db399d8..f8b72efc28cf2 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The ObjectReplicationPolicies service client. </summary>
-    public partial class ObjectReplicationPoliciesClient
+    public partial class ObjectReplicationPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ObjectReplicationPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ObjectReplicationPoliciesClient for mocking. </summary>
-        protected ObjectReplicationPoliciesClient()
+        internal ObjectReplicationPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ObjectReplicationPoliciesOperations for mocking. </summary>
+        protected ObjectReplicationPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ObjectReplicationPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of ObjectReplicationPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ObjectReplicationPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal ObjectReplicationPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new ObjectReplicationPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ObjectReplicationPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal ObjectReplicationPoliciesClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ObjectReplicationPolicy>> GetAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<ObjectReplicationPolicy>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ObjectReplicationPolicy> Get(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -86,7 +86,7 @@ public virtual Response<ObjectReplicationPolicy> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ObjectReplicationPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, ObjectReplicationPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -107,7 +107,7 @@ public virtual async Task<Response<ObjectReplicationPolicy>> CreateOrUpdateAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ObjectReplicationPolicy> CreateOrUpdate(string resourceGroupName, string accountName, string objectReplicationPolicyId, ObjectReplicationPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<ObjectReplicationPolicy> CreateOrUpdate(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Delete");
             scope.Start();
             try
             {
@@ -147,7 +147,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Delete");
             scope.Start();
             try
             {
@@ -177,7 +177,7 @@ public virtual AsyncPageable<ObjectReplicationPolicy> ListAsync(string resourceG
 
             async Task<Page<ObjectReplicationPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual Pageable<ObjectReplicationPolicy> List(string resourceGroupName,
 
             Page<ObjectReplicationPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesRestOperations.cs
index e6940a22362d3..410eb85c3c325 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/ObjectReplicationPoliciesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class ObjectReplicationPoliciesRestClient
+    internal partial class ObjectReplicationPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ObjectReplicationPoliciesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ObjectReplicationPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of ObjectReplicationPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ObjectReplicationPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public ObjectReplicationPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/OperationsClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/Operations.cs
similarity index 80%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/OperationsClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/Operations.cs
index f18e107630249..999df2431d948 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/OperationsClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/Operations.cs
@@ -15,24 +15,24 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint, apiVersion);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -65,7 +65,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsOperations.cs
similarity index 93%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsOperations.cs
index ed011cbe913e8..d97211bfe7a76 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The PrivateEndpointConnections service client. </summary>
-    public partial class PrivateEndpointConnectionsClient
+    public partial class PrivateEndpointConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateEndpointConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient for mocking. </summary>
-        protected PrivateEndpointConnectionsClient()
+        internal PrivateEndpointConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations for mocking. </summary>
+        protected PrivateEndpointConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal PrivateEndpointConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new PrivateEndpointConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateEndpointConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -86,7 +86,7 @@ public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> PutAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Put");
             scope.Start();
             try
             {
@@ -107,7 +107,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> PutAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Put(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Put");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<PrivateEndpointConnection> Put(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Delete");
             scope.Start();
             try
             {
@@ -147,7 +147,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Delete");
             scope.Start();
             try
             {
@@ -177,7 +177,7 @@ public virtual AsyncPageable<PrivateEndpointConnection> ListAsync(string resourc
 
             async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual Pageable<PrivateEndpointConnection> List(string resourceGroupName
 
             Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsRestOperations.cs
index 6adc5d5d6eeec..aef0a80b3b424 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateEndpointConnectionsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class PrivateEndpointConnectionsRestClient
+    internal partial class PrivateEndpointConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateEndpointConnectionsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateEndpointConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public PrivateEndpointConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesOperations.cs
similarity index 83%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesOperations.cs
index 00bf28407e7f7..046bef80bfd59 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The PrivateLinkResources service client. </summary>
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateLinkResourcesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateLinkResourcesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient for mocking. </summary>
-        protected PrivateLinkResourcesClient()
+        internal PrivateLinkResourcesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations for mocking. </summary>
+        protected PrivateLinkResourcesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal PrivateLinkResourcesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new PrivateLinkResourcesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateLinkResourcesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkResourceListResult>> ListByStorageAccountAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByStorageAccount");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByStorageAccount");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<PrivateLinkResourceListResult>> ListByStorage
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkResourceListResult> ListByStorageAccount(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByStorageAccount");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByStorageAccount");
             scope.Start();
             try
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesRestOperations.cs
similarity index 96%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesRestOperations.cs
index 5087b5ac6a530..ac5dd1247cbc9 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/PrivateLinkResourcesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class PrivateLinkResourcesRestClient
+    internal partial class PrivateLinkResourcesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateLinkResourcesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateLinkResourcesRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateLinkResourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public PrivateLinkResourcesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueOperations.cs
similarity index 95%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueOperations.cs
index f6f8a3e90378f..2cd364e30fb01 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The Queue service client. </summary>
-    public partial class QueueClient
+    public partial class QueueOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal QueueRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of QueueClient for mocking. </summary>
-        protected QueueClient()
+        internal QueueRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of QueueOperations for mocking. </summary>
+        protected QueueOperations()
         {
         }
-        /// <summary> Initializes a new instance of QueueClient. </summary>
+        /// <summary> Initializes a new instance of QueueOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal QueueClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal QueueOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new QueueRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new QueueRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal QueueClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageQueue>> CreateAsync(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Create");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<StorageQueue>> CreateAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageQueue> Create(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Create");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<StorageQueue> Create(string resourceGroupName, string ac
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageQueue>> UpdateAsync(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Update");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<StorageQueue>> UpdateAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageQueue> Update(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Update");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<StorageQueue> Update(string resourceGroupName, string ac
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageQueue>> GetAsync(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<StorageQueue>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageQueue> Get(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Get");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<StorageQueue> Get(string resourceGroupName, string accou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Delete");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Delete");
             scope.Start();
             try
             {
@@ -221,7 +221,7 @@ public virtual AsyncPageable<ListQueue> ListAsync(string resourceGroupName, stri
 
             async Task<Page<ListQueue>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
@@ -236,7 +236,7 @@ async Task<Page<ListQueue>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ListQueue>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
@@ -271,7 +271,7 @@ public virtual Pageable<ListQueue> List(string resourceGroupName, string account
 
             Page<ListQueue> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ Page<ListQueue> FirstPageFunc(int? pageSizeHint)
             }
             Page<ListQueue> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueRestOperations.cs
similarity index 99%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueRestOperations.cs
index b7b3bb4786518..02fe2e0227a5e 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class QueueRestClient
+    internal partial class QueueRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class QueueRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of QueueRestClient. </summary>
+        /// <summary> Initializes a new instance of QueueRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public QueueRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public QueueRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesOperations.cs
similarity index 91%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesOperations.cs
index 8bf300bad7686..26a0cd5775843 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The QueueServices service client. </summary>
-    public partial class QueueServicesClient
+    public partial class QueueServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal QueueServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of QueueServicesClient for mocking. </summary>
-        protected QueueServicesClient()
+        internal QueueServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of QueueServicesOperations for mocking. </summary>
+        protected QueueServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of QueueServicesClient. </summary>
+        /// <summary> Initializes a new instance of QueueServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal QueueServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal QueueServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new QueueServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new QueueServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal QueueServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListQueueServices>> ListAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.List");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ListQueueServices>> ListAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListQueueServices> List(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.List");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ListQueueServices> List(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<QueueServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, QueueServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<QueueServiceProperties>> SetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<QueueServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, QueueServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<QueueServiceProperties> SetServiceProperties(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<QueueServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<QueueServiceProperties>> GetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<QueueServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesRestOperations.cs
index 22fef0d856ed0..40117dfcb7ecb 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/QueueServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class QueueServicesRestClient
+    internal partial class QueueServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class QueueServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of QueueServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of QueueServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public QueueServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public QueueServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/OperationsRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/RestOperations.cs
similarity index 94%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/OperationsRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/RestOperations.cs
index 6b95fa0a0883b..c73057c39d9dc 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/OperationsRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/RestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private string apiVersion;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             endpoint ??= new Uri("https://management.azure.com");
             if (apiVersion == null)
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusOperations.cs
similarity index 82%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusOperations.cs
index 0db828788c039..818c496f8e278 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The Skus service client. </summary>
-    public partial class SkusClient
+    public partial class SkusOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SkusRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SkusClient for mocking. </summary>
-        protected SkusClient()
+        internal SkusRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SkusOperations for mocking. </summary>
+        protected SkusOperations()
         {
         }
-        /// <summary> Initializes a new instance of SkusClient. </summary>
+        /// <summary> Initializes a new instance of SkusOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal SkusClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal SkusOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new SkusRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new SkusRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ public virtual AsyncPageable<SkuInformation> ListAsync(CancellationToken cancell
         {
             async Task<Page<SkuInformation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -66,7 +66,7 @@ public virtual Pageable<SkuInformation> List(CancellationToken cancellationToken
         {
             Page<SkuInformation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SkusOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusRestOperations.cs
similarity index 94%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusRestOperations.cs
index bb24d892e51e5..a5eb9253d3e60 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/SkusRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class SkusRestClient
+    internal partial class SkusRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class SkusRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SkusRestClient. </summary>
+        /// <summary> Initializes a new instance of SkusRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SkusRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public SkusRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsOperations.cs
similarity index 95%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsOperations.cs
index faa7e7373a7dc..660438c8b37de 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The StorageAccounts service client. </summary>
-    public partial class StorageAccountsClient
+    public partial class StorageAccountsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal StorageAccountsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of StorageAccountsClient for mocking. </summary>
-        protected StorageAccountsClient()
+        internal StorageAccountsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of StorageAccountsOperations for mocking. </summary>
+        protected StorageAccountsOperations()
         {
         }
-        /// <summary> Initializes a new instance of StorageAccountsClient. </summary>
+        /// <summary> Initializes a new instance of StorageAccountsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal StorageAccountsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal StorageAccountsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new StorageAccountsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new StorageAccountsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal StorageAccountsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(StorageAccountCheckNameAvailabilityParameters accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(StorageAccountCheckNameAvailabilityParameters accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(Stora
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Delete");
             scope.Start();
             try
             {
@@ -99,7 +99,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Delete");
             scope.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response Delete(string resourceGroupName, string accountName, Can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccount>> GetPropertiesAsync(string resourceGroupName, string accountName, StorageAccountExpand? expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.GetProperties");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.GetProperties");
             scope.Start();
             try
             {
@@ -139,7 +139,7 @@ public virtual async Task<Response<StorageAccount>> GetPropertiesAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccount> GetProperties(string resourceGroupName, string accountName, StorageAccountExpand? expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.GetProperties");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.GetProperties");
             scope.Start();
             try
             {
@@ -159,7 +159,7 @@ public virtual Response<StorageAccount> GetProperties(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccount>> UpdateAsync(string resourceGroupName, string accountName, StorageAccountUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Update");
             scope.Start();
             try
             {
@@ -179,7 +179,7 @@ public virtual async Task<Response<StorageAccount>> UpdateAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccount> Update(string resourceGroupName, string accountName, StorageAccountUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Update");
             scope.Start();
             try
             {
@@ -198,7 +198,7 @@ public virtual Response<StorageAccount> Update(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccountListKeysResult>> ListKeysAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -217,7 +217,7 @@ public virtual async Task<Response<StorageAccountListKeysResult>> ListKeysAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccountListKeysResult> ListKeys(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual Response<StorageAccountListKeysResult> ListKeys(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccountListKeysResult>> RegenerateKeyAsync(string resourceGroupName, string accountName, StorageAccountRegenerateKeyParameters regenerateKey, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RegenerateKey");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RegenerateKey");
             scope.Start();
             try
             {
@@ -257,7 +257,7 @@ public virtual async Task<Response<StorageAccountListKeysResult>> RegenerateKeyA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccountListKeysResult> RegenerateKey(string resourceGroupName, string accountName, StorageAccountRegenerateKeyParameters regenerateKey, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RegenerateKey");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RegenerateKey");
             scope.Start();
             try
             {
@@ -277,7 +277,7 @@ public virtual Response<StorageAccountListKeysResult> RegenerateKey(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListAccountSasResponse>> ListAccountSASAsync(string resourceGroupName, string accountName, AccountSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListAccountSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListAccountSAS");
             scope.Start();
             try
             {
@@ -297,7 +297,7 @@ public virtual async Task<Response<ListAccountSasResponse>> ListAccountSASAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListAccountSasResponse> ListAccountSAS(string resourceGroupName, string accountName, AccountSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListAccountSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListAccountSAS");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual Response<ListAccountSasResponse> ListAccountSAS(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListServiceSasResponse>> ListServiceSASAsync(string resourceGroupName, string accountName, ServiceSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListServiceSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListServiceSAS");
             scope.Start();
             try
             {
@@ -337,7 +337,7 @@ public virtual async Task<Response<ListServiceSasResponse>> ListServiceSASAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListServiceSasResponse> ListServiceSAS(string resourceGroupName, string accountName, ServiceSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListServiceSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListServiceSAS");
             scope.Start();
             try
             {
@@ -356,7 +356,7 @@ public virtual Response<ListServiceSasResponse> ListServiceSAS(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RevokeUserDelegationKeysAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RevokeUserDelegationKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RevokeUserDelegationKeys");
             scope.Start();
             try
             {
@@ -375,7 +375,7 @@ public virtual async Task<Response> RevokeUserDelegationKeysAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response RevokeUserDelegationKeys(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RevokeUserDelegationKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RevokeUserDelegationKeys");
             scope.Start();
             try
             {
@@ -394,7 +394,7 @@ public virtual AsyncPageable<StorageAccount> ListAsync(CancellationToken cancell
         {
             async Task<Page<StorageAccount>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -409,7 +409,7 @@ async Task<Page<StorageAccount>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<StorageAccount>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -431,7 +431,7 @@ public virtual Pageable<StorageAccount> List(CancellationToken cancellationToken
         {
             Page<StorageAccount> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -446,7 +446,7 @@ Page<StorageAccount> FirstPageFunc(int? pageSizeHint)
             }
             Page<StorageAccount> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -474,7 +474,7 @@ public virtual AsyncPageable<StorageAccount> ListByResourceGroupAsync(string res
 
             async Task<Page<StorageAccount>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -502,7 +502,7 @@ public virtual Pageable<StorageAccount> ListByResourceGroup(string resourceGroup
 
             Page<StorageAccount> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -538,7 +538,7 @@ public virtual async Task<StorageAccountsCreateOperation> StartCreateAsync(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartCreate");
             scope.Start();
             try
             {
@@ -572,7 +572,7 @@ public virtual StorageAccountsCreateOperation StartCreate(string resourceGroupNa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartCreate");
             scope.Start();
             try
             {
@@ -601,7 +601,7 @@ public virtual async Task<StorageAccountsFailoverOperation> StartFailoverAsync(s
                 throw new ArgumentNullException(nameof(accountName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartFailover");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartFailover");
             scope.Start();
             try
             {
@@ -630,7 +630,7 @@ public virtual StorageAccountsFailoverOperation StartFailover(string resourceGro
                 throw new ArgumentNullException(nameof(accountName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartFailover");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartFailover");
             scope.Start();
             try
             {
@@ -664,7 +664,7 @@ public virtual async Task<StorageAccountsRestoreBlobRangesOperation> StartRestor
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartRestoreBlobRanges");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartRestoreBlobRanges");
             scope.Start();
             try
             {
@@ -698,7 +698,7 @@ public virtual StorageAccountsRestoreBlobRangesOperation StartRestoreBlobRanges(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartRestoreBlobRanges");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartRestoreBlobRanges");
             scope.Start();
             try
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsRestOperations.cs
similarity index 99%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsRestOperations.cs
index 7e8d83a21f721..279ee78cf3bc6 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageAccountsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class StorageAccountsRestClient
+    internal partial class StorageAccountsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class StorageAccountsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of StorageAccountsRestClient. </summary>
+        /// <summary> Initializes a new instance of StorageAccountsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public StorageAccountsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public StorageAccountsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageManagementClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageManagementClient.cs
index 9f626a0edf1ac..c88f5d88a784d 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageManagementClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/StorageManagementClient.cs
@@ -53,106 +53,55 @@ public StorageManagementClient(Uri endpoint, string subscriptionId, TokenCredent
             _subscriptionId = subscriptionId;
         }
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of SkusClient. </summary>
-        public virtual SkusClient GetSkusClient()
-        {
-            return new SkusClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SkusOperations. </summary>
+        public virtual SkusOperations Skus => new SkusOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of StorageAccountsClient. </summary>
-        public virtual StorageAccountsClient GetStorageAccountsClient()
-        {
-            return new StorageAccountsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of StorageAccountsOperations. </summary>
+        public virtual StorageAccountsOperations StorageAccounts => new StorageAccountsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of UsagesClient. </summary>
-        public virtual UsagesClient GetUsagesClient()
-        {
-            return new UsagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of UsagesOperations. </summary>
+        public virtual UsagesOperations Usages => new UsagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ManagementPoliciesClient. </summary>
-        public virtual ManagementPoliciesClient GetManagementPoliciesClient()
-        {
-            return new ManagementPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ManagementPoliciesOperations. </summary>
+        public virtual ManagementPoliciesOperations ManagementPolicies => new ManagementPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateEndpointConnectionsClient. </summary>
-        public virtual PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient()
-        {
-            return new PrivateEndpointConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateEndpointConnectionsOperations. </summary>
+        public virtual PrivateEndpointConnectionsOperations PrivateEndpointConnections => new PrivateEndpointConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateLinkResourcesClient. </summary>
-        public virtual PrivateLinkResourcesClient GetPrivateLinkResourcesClient()
-        {
-            return new PrivateLinkResourcesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateLinkResourcesOperations. </summary>
+        public virtual PrivateLinkResourcesOperations PrivateLinkResources => new PrivateLinkResourcesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ObjectReplicationPoliciesClient. </summary>
-        public virtual ObjectReplicationPoliciesClient GetObjectReplicationPoliciesClient()
-        {
-            return new ObjectReplicationPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ObjectReplicationPoliciesOperations. </summary>
+        public virtual ObjectReplicationPoliciesOperations ObjectReplicationPolicies => new ObjectReplicationPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of EncryptionScopesClient. </summary>
-        public virtual EncryptionScopesClient GetEncryptionScopesClient()
-        {
-            return new EncryptionScopesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of EncryptionScopesOperations. </summary>
+        public virtual EncryptionScopesOperations EncryptionScopes => new EncryptionScopesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BlobServicesClient. </summary>
-        public virtual BlobServicesClient GetBlobServicesClient()
-        {
-            return new BlobServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BlobServicesOperations. </summary>
+        public virtual BlobServicesOperations BlobServices => new BlobServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BlobContainersClient. </summary>
-        public virtual BlobContainersClient GetBlobContainersClient()
-        {
-            return new BlobContainersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BlobContainersOperations. </summary>
+        public virtual BlobContainersOperations BlobContainers => new BlobContainersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FileServicesClient. </summary>
-        public virtual FileServicesClient GetFileServicesClient()
-        {
-            return new FileServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FileServicesOperations. </summary>
+        public virtual FileServicesOperations FileServices => new FileServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FileSharesClient. </summary>
-        public virtual FileSharesClient GetFileSharesClient()
-        {
-            return new FileSharesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FileSharesOperations. </summary>
+        public virtual FileSharesOperations FileShares => new FileSharesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of QueueServicesClient. </summary>
-        public virtual QueueServicesClient GetQueueServicesClient()
-        {
-            return new QueueServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of QueueServicesOperations. </summary>
+        public virtual QueueServicesOperations QueueServices => new QueueServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of QueueClient. </summary>
-        public virtual QueueClient GetQueueClient()
-        {
-            return new QueueClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of QueueOperations. </summary>
+        public virtual QueueOperations Queue => new QueueOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of TableServicesClient. </summary>
-        public virtual TableServicesClient GetTableServicesClient()
-        {
-            return new TableServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of TableServicesOperations. </summary>
+        public virtual TableServicesOperations TableServices => new TableServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of TableClient. </summary>
-        public virtual TableClient GetTableClient()
-        {
-            return new TableClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of TableOperations. </summary>
+        public virtual TableOperations Table => new TableOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableOperations.cs
similarity index 95%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableOperations.cs
index 3322c2b9aec21..2710fa48832aa 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The Table service client. </summary>
-    public partial class TableClient
+    public partial class TableOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TableRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TableClient for mocking. </summary>
-        protected TableClient()
+        internal TableRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TableOperations for mocking. </summary>
+        protected TableOperations()
         {
         }
-        /// <summary> Initializes a new instance of TableClient. </summary>
+        /// <summary> Initializes a new instance of TableOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal TableClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal TableOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new TableRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new TableRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal TableClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Table>> CreateAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Create");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<Table>> CreateAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Table> Create(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Create");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<Table> Create(string resourceGroupName, string accountNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Table>> UpdateAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Update");
             scope.Start();
             try
             {
@@ -105,7 +105,7 @@ public virtual async Task<Response<Table>> UpdateAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Table> Update(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Update");
             scope.Start();
             try
             {
@@ -125,7 +125,7 @@ public virtual Response<Table> Update(string resourceGroupName, string accountNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Table>> GetAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Get");
             scope.Start();
             try
             {
@@ -145,7 +145,7 @@ public virtual async Task<Response<Table>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Table> Get(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Get");
             scope.Start();
             try
             {
@@ -165,7 +165,7 @@ public virtual Response<Table> Get(string resourceGroupName, string accountName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Delete");
             scope.Start();
             try
             {
@@ -185,7 +185,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Delete");
             scope.Start();
             try
             {
@@ -215,7 +215,7 @@ public virtual AsyncPageable<Table> ListAsync(string resourceGroupName, string a
 
             async Task<Page<Table>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
@@ -230,7 +230,7 @@ async Task<Page<Table>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Table>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ public virtual Pageable<Table> List(string resourceGroupName, string accountName
 
             Page<Table> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
@@ -278,7 +278,7 @@ Page<Table> FirstPageFunc(int? pageSizeHint)
             }
             Page<Table> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableRestOperations.cs
similarity index 99%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableRestOperations.cs
index cddfcb366ec0a..79d954a5ff3ed 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class TableRestClient
+    internal partial class TableRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class TableRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TableRestClient. </summary>
+        /// <summary> Initializes a new instance of TableRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public TableRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public TableRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesOperations.cs
similarity index 91%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesOperations.cs
index 60134f41478be..14c5464e16871 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The TableServices service client. </summary>
-    public partial class TableServicesClient
+    public partial class TableServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TableServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TableServicesClient for mocking. </summary>
-        protected TableServicesClient()
+        internal TableServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TableServicesOperations for mocking. </summary>
+        protected TableServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of TableServicesClient. </summary>
+        /// <summary> Initializes a new instance of TableServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal TableServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal TableServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new TableServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new TableServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal TableServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListTableServices>> ListAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.List");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ListTableServices>> ListAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListTableServices> List(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.List");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ListTableServices> List(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TableServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, TableServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<TableServiceProperties>> SetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TableServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, TableServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<TableServiceProperties> SetServiceProperties(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TableServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<TableServiceProperties>> GetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TableServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesRestOperations.cs
similarity index 98%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesRestOperations.cs
index 1cc7dae7b41ff..01bbd1b17843c 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/TableServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class TableServicesRestClient
+    internal partial class TableServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class TableServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TableServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of TableServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public TableServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public TableServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesOperations.cs
similarity index 84%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesOperations.cs
index fd35da3ef0acb..be7ed743f0a45 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.ResourceManager.Storage
 {
     /// <summary> The Usages service client. </summary>
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsagesClient for mocking. </summary>
-        protected UsagesClient()
+        internal UsagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsagesOperations for mocking. </summary>
+        protected UsagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsagesClient. </summary>
+        /// <summary> Initializes a new instance of UsagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal UsagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal UsagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new UsagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new UsagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -50,7 +50,7 @@ public virtual AsyncPageable<Usage> ListByLocationAsync(string location, Cancell
 
             async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -78,7 +78,7 @@ public virtual Pageable<Usage> ListByLocation(string location, CancellationToken
 
             Page<Usage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
diff --git a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesRestClient.cs b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesRestOperations.cs
similarity index 94%
rename from sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesRestClient.cs
rename to sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesRestOperations.cs
index abb1616854a97..df02fc45958cf 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesRestClient.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/src/Generated/UsagesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.ResourceManager.Storage
 {
-    internal partial class UsagesRestClient
+    internal partial class UsagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class UsagesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsagesRestClient. </summary>
+        /// <summary> Initializes a new instance of UsagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public UsagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsOperations.cs
index 3baaabaaa16fd..a5601613cb412 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The Applications service client. </summary>
-    public partial class ApplicationsClient
+    public partial class ApplicationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationsClient for mocking. </summary>
-        protected ApplicationsClient()
+        internal ApplicationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationsOperations for mocking. </summary>
+        protected ApplicationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationsClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal ApplicationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new ApplicationsRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new ApplicationsRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> CreateAsync(ApplicationCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Create");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<Application>> CreateAsync(ApplicationCreatePa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> Create(ApplicationCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Create");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response<Application> Create(ApplicationCreateParameters paramete
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string applicationObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Delete");
             scope.Start();
             try
             {
@@ -97,7 +97,7 @@ public virtual async Task<Response> DeleteAsync(string applicationObjectId, Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string applicationObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Delete");
             scope.Start();
             try
             {
@@ -115,7 +115,7 @@ public virtual Response Delete(string applicationObjectId, CancellationToken can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> GetAsync(string applicationObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -133,7 +133,7 @@ public virtual async Task<Response<Application>> GetAsync(string applicationObje
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> Get(string applicationObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual Response<Application> Get(string applicationObjectId, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> PatchAsync(string applicationObjectId, ApplicationUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Patch");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual async Task<Response> PatchAsync(string applicationObjectId, Appli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Patch(string applicationObjectId, ApplicationUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.Patch");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual Response Patch(string applicationObjectId, ApplicationUpdateParam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> AddOwnerAsync(string applicationObjectId, AddOwnerParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.AddOwner");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.AddOwner");
             scope.Start();
             try
             {
@@ -209,7 +209,7 @@ public virtual async Task<Response> AddOwnerAsync(string applicationObjectId, Ad
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response AddOwner(string applicationObjectId, AddOwnerParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.AddOwner");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.AddOwner");
             scope.Start();
             try
             {
@@ -228,7 +228,7 @@ public virtual Response AddOwner(string applicationObjectId, AddOwnerParameters
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RemoveOwnerAsync(string applicationObjectId, string ownerObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.RemoveOwner");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.RemoveOwner");
             scope.Start();
             try
             {
@@ -247,7 +247,7 @@ public virtual async Task<Response> RemoveOwnerAsync(string applicationObjectId,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response RemoveOwner(string applicationObjectId, string ownerObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.RemoveOwner");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.RemoveOwner");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual Response RemoveOwner(string applicationObjectId, string ownerObje
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> UpdateKeyCredentialsAsync(string applicationObjectId, KeyCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.UpdateKeyCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.UpdateKeyCredentials");
             scope.Start();
             try
             {
@@ -285,7 +285,7 @@ public virtual async Task<Response> UpdateKeyCredentialsAsync(string application
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response UpdateKeyCredentials(string applicationObjectId, KeyCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.UpdateKeyCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.UpdateKeyCredentials");
             scope.Start();
             try
             {
@@ -304,7 +304,7 @@ public virtual Response UpdateKeyCredentials(string applicationObjectId, KeyCred
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> UpdatePasswordCredentialsAsync(string applicationObjectId, PasswordCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.UpdatePasswordCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.UpdatePasswordCredentials");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<Response> UpdatePasswordCredentialsAsync(string applic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response UpdatePasswordCredentials(string applicationObjectId, PasswordCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.UpdatePasswordCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.UpdatePasswordCredentials");
             scope.Start();
             try
             {
@@ -341,7 +341,7 @@ public virtual Response UpdatePasswordCredentials(string applicationObjectId, Pa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServicePrincipalObjectResult>> GetServicePrincipalsIdByAppIdAsync(string applicationID, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.GetServicePrincipalsIdByAppId");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.GetServicePrincipalsIdByAppId");
             scope.Start();
             try
             {
@@ -359,7 +359,7 @@ public virtual async Task<Response<ServicePrincipalObjectResult>> GetServicePrin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServicePrincipalObjectResult> GetServicePrincipalsIdByAppId(string applicationID, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.GetServicePrincipalsIdByAppId");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.GetServicePrincipalsIdByAppId");
             scope.Start();
             try
             {
@@ -379,7 +379,7 @@ public virtual AsyncPageable<Application> ListAsync(string filter = null, Cancel
         {
             async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -394,7 +394,7 @@ async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Application>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -417,7 +417,7 @@ public virtual Pageable<Application> List(string filter = null, CancellationToke
         {
             Page<Application> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -432,7 +432,7 @@ Page<Application> FirstPageFunc(int? pageSizeHint)
             }
             Page<Application> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -460,7 +460,7 @@ public virtual AsyncPageable<DirectoryObject> ListOwnersAsync(string application
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -475,7 +475,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -503,7 +503,7 @@ public virtual Pageable<DirectoryObject> ListOwners(string applicationObjectId,
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -518,7 +518,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -546,7 +546,7 @@ public virtual AsyncPageable<KeyCredential> ListKeyCredentialsAsync(string appli
 
             async Task<Page<KeyCredential>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListKeyCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListKeyCredentials");
                 scope.Start();
                 try
                 {
@@ -574,7 +574,7 @@ public virtual Pageable<KeyCredential> ListKeyCredentials(string applicationObje
 
             Page<KeyCredential> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListKeyCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListKeyCredentials");
                 scope.Start();
                 try
                 {
@@ -602,7 +602,7 @@ public virtual AsyncPageable<PasswordCredential> ListPasswordCredentialsAsync(st
 
             async Task<Page<PasswordCredential>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListPasswordCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListPasswordCredentials");
                 scope.Start();
                 try
                 {
@@ -630,7 +630,7 @@ public virtual Pageable<PasswordCredential> ListPasswordCredentials(string appli
 
             Page<PasswordCredential> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListPasswordCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListPasswordCredentials");
                 scope.Start();
                 try
                 {
@@ -658,7 +658,7 @@ public virtual AsyncPageable<Application> ListNextAsync(string nextLink, Cancell
 
             async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -673,7 +673,7 @@ async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Application>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -701,7 +701,7 @@ public virtual Pageable<Application> ListNext(string nextLink, CancellationToken
 
             Page<Application> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -716,7 +716,7 @@ Page<Application> FirstPageFunc(int? pageSizeHint)
             }
             Page<Application> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs
index 8666200a4757a..cf276149823c6 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ApplicationsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class ApplicationsRestClient
+    internal partial class ApplicationsRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ApplicationsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationsRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public ApplicationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsOperations.cs
index e67245bb43a6f..2e5df83f152f7 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The DeletedApplications service client. </summary>
-    public partial class DeletedApplicationsClient
+    public partial class DeletedApplicationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DeletedApplicationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DeletedApplicationsClient for mocking. </summary>
-        protected DeletedApplicationsClient()
+        internal DeletedApplicationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DeletedApplicationsOperations for mocking. </summary>
+        protected DeletedApplicationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DeletedApplicationsClient. </summary>
+        /// <summary> Initializes a new instance of DeletedApplicationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal DeletedApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal DeletedApplicationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new DeletedApplicationsRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new DeletedApplicationsRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DeletedApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Application>> RestoreAsync(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.Restore");
+            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.Restore");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<Application>> RestoreAsync(string objectId, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Application> Restore(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.Restore");
+            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.Restore");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response<Application> Restore(string objectId, CancellationToken
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> HardDeleteAsync(string applicationObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.HardDelete");
+            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.HardDelete");
             scope.Start();
             try
             {
@@ -97,7 +97,7 @@ public virtual async Task<Response> HardDeleteAsync(string applicationObjectId,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response HardDelete(string applicationObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.HardDelete");
+            using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.HardDelete");
             scope.Start();
             try
             {
@@ -117,7 +117,7 @@ public virtual AsyncPageable<Application> ListAsync(string filter = null, Cancel
         {
             async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Application>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -155,7 +155,7 @@ public virtual Pageable<Application> List(string filter = null, CancellationToke
         {
             Page<Application> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ Page<Application> FirstPageFunc(int? pageSizeHint)
             }
             Page<Application> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual AsyncPageable<Application> ListNextAsync(string nextLink, Cancell
 
             async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -213,7 +213,7 @@ async Task<Page<Application>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Application>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -241,7 +241,7 @@ public virtual Pageable<Application> ListNext(string nextLink, CancellationToken
 
             Page<Application> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -256,7 +256,7 @@ Page<Application> FirstPageFunc(int? pageSizeHint)
             }
             Page<Application> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("DeletedApplicationsOperations.ListNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs
index 3f9545b09120b..ed29c63f2ce31 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DeletedApplicationsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class DeletedApplicationsRestClient
+    internal partial class DeletedApplicationsRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class DeletedApplicationsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DeletedApplicationsRestClient. </summary>
+        /// <summary> Initializes a new instance of DeletedApplicationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DeletedApplicationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public DeletedApplicationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsOperations.cs
similarity index 86%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsOperations.cs
index e4bce47726236..4a0bb27cd31f4 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The Domains service client. </summary>
-    public partial class DomainsClient
+    public partial class DomainsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DomainsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DomainsClient for mocking. </summary>
-        protected DomainsClient()
+        internal DomainsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DomainsOperations for mocking. </summary>
+        protected DomainsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DomainsClient. </summary>
+        /// <summary> Initializes a new instance of DomainsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal DomainsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal DomainsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new DomainsRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new DomainsRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DomainsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Domain>> GetAsync(string domainName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DomainsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DomainsOperations.Get");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<Domain>> GetAsync(string domainName, Cancella
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Domain> Get(string domainName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DomainsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DomainsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual AsyncPageable<Domain> ListAsync(string filter = null, Cancellatio
         {
             async Task<Page<Domain>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DomainsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DomainsOperations.List");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ public virtual Pageable<Domain> List(string filter = null, CancellationToken can
         {
             Page<Domain> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DomainsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DomainsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsRestOperations.cs
index f955ec457f28a..a102cd154f5ee 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/DomainsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class DomainsRestClient
+    internal partial class DomainsRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class DomainsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DomainsRestClient. </summary>
+        /// <summary> Initializes a new instance of DomainsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DomainsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public DomainsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsOperations.cs
index 6e523939395ab..7e1ac7b05b892 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The Groups service client. </summary>
-    public partial class GroupsClient
+    public partial class GroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GroupsClient for mocking. </summary>
-        protected GroupsClient()
+        internal GroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GroupsOperations for mocking. </summary>
+        protected GroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GroupsClient. </summary>
+        /// <summary> Initializes a new instance of GroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal GroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal GroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new GroupsRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new GroupsRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal GroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<CheckGroupMembershipResult>> IsMemberOfAsync(CheckGroupMembershipParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.IsMemberOf");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.IsMemberOf");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<CheckGroupMembershipResult>> IsMemberOfAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<CheckGroupMembershipResult> IsMemberOf(CheckGroupMembershipParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.IsMemberOf");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.IsMemberOf");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<CheckGroupMembershipResult> IsMemberOf(CheckGroupMembers
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RemoveMemberAsync(string groupObjectId, string memberObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.RemoveMember");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.RemoveMember");
             scope.Start();
             try
             {
@@ -99,7 +99,7 @@ public virtual async Task<Response> RemoveMemberAsync(string groupObjectId, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response RemoveMember(string groupObjectId, string memberObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.RemoveMember");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.RemoveMember");
             scope.Start();
             try
             {
@@ -118,7 +118,7 @@ public virtual Response RemoveMember(string groupObjectId, string memberObjectId
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> AddMemberAsync(string groupObjectId, GroupAddMemberParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.AddMember");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.AddMember");
             scope.Start();
             try
             {
@@ -137,7 +137,7 @@ public virtual async Task<Response> AddMemberAsync(string groupObjectId, GroupAd
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response AddMember(string groupObjectId, GroupAddMemberParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.AddMember");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.AddMember");
             scope.Start();
             try
             {
@@ -155,7 +155,7 @@ public virtual Response AddMember(string groupObjectId, GroupAddMemberParameters
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ADGroup>> CreateAsync(GroupCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.Create");
             scope.Start();
             try
             {
@@ -173,7 +173,7 @@ public virtual async Task<Response<ADGroup>> CreateAsync(GroupCreateParameters p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ADGroup> Create(GroupCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.Create");
             scope.Start();
             try
             {
@@ -191,7 +191,7 @@ public virtual Response<ADGroup> Create(GroupCreateParameters parameters, Cancel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ADGroup>> GetAsync(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.Get");
             scope.Start();
             try
             {
@@ -209,7 +209,7 @@ public virtual async Task<Response<ADGroup>> GetAsync(string objectId, Cancellat
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ADGroup> Get(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.Get");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual Response<ADGroup> Get(string objectId, CancellationToken cancella
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -245,7 +245,7 @@ public virtual async Task<Response> DeleteAsync(string objectId, CancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -264,7 +264,7 @@ public virtual Response Delete(string objectId, CancellationToken cancellationTo
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> AddOwnerAsync(string objectId, AddOwnerParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.AddOwner");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.AddOwner");
             scope.Start();
             try
             {
@@ -283,7 +283,7 @@ public virtual async Task<Response> AddOwnerAsync(string objectId, AddOwnerParam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response AddOwner(string objectId, AddOwnerParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.AddOwner");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.AddOwner");
             scope.Start();
             try
             {
@@ -302,7 +302,7 @@ public virtual Response AddOwner(string objectId, AddOwnerParameters parameters,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RemoveOwnerAsync(string objectId, string ownerObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.RemoveOwner");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.RemoveOwner");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual async Task<Response> RemoveOwnerAsync(string objectId, string own
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response RemoveOwner(string objectId, string ownerObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GroupsClient.RemoveOwner");
+            using var scope = _clientDiagnostics.CreateScope("GroupsOperations.RemoveOwner");
             scope.Start();
             try
             {
@@ -341,7 +341,7 @@ public virtual AsyncPageable<ADGroup> ListAsync(string filter = null, Cancellati
         {
             async Task<Page<ADGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -356,7 +356,7 @@ async Task<Page<ADGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ADGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -379,7 +379,7 @@ public virtual Pageable<ADGroup> List(string filter = null, CancellationToken ca
         {
             Page<ADGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -394,7 +394,7 @@ Page<ADGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ADGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -422,7 +422,7 @@ public virtual AsyncPageable<DirectoryObject> GetGroupMembersAsync(string object
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembers");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembers");
                 scope.Start();
                 try
                 {
@@ -437,7 +437,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembers");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembers");
                 scope.Start();
                 try
                 {
@@ -465,7 +465,7 @@ public virtual Pageable<DirectoryObject> GetGroupMembers(string objectId, Cancel
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembers");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembers");
                 scope.Start();
                 try
                 {
@@ -480,7 +480,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembers");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembers");
                 scope.Start();
                 try
                 {
@@ -513,7 +513,7 @@ public virtual AsyncPageable<string> GetMemberGroupsAsync(string objectId, Group
 
             async Task<Page<string>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetMemberGroups");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetMemberGroups");
                 scope.Start();
                 try
                 {
@@ -546,7 +546,7 @@ public virtual Pageable<string> GetMemberGroups(string objectId, GroupGetMemberG
 
             Page<string> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetMemberGroups");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetMemberGroups");
                 scope.Start();
                 try
                 {
@@ -574,7 +574,7 @@ public virtual AsyncPageable<DirectoryObject> ListOwnersAsync(string objectId, C
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -589,7 +589,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -617,7 +617,7 @@ public virtual Pageable<DirectoryObject> ListOwners(string objectId, Cancellatio
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -632,7 +632,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -660,7 +660,7 @@ public virtual AsyncPageable<ADGroup> ListNextAsync(string nextLink, Cancellatio
 
             async Task<Page<ADGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -675,7 +675,7 @@ async Task<Page<ADGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ADGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -703,7 +703,7 @@ public virtual Pageable<ADGroup> ListNext(string nextLink, CancellationToken can
 
             Page<ADGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -718,7 +718,7 @@ Page<ADGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ADGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -746,7 +746,7 @@ public virtual AsyncPageable<DirectoryObject> GetGroupMembersNextAsync(string ne
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembersNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembersNext");
                 scope.Start();
                 try
                 {
@@ -761,7 +761,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembersNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembersNext");
                 scope.Start();
                 try
                 {
@@ -789,7 +789,7 @@ public virtual Pageable<DirectoryObject> GetGroupMembersNext(string nextLink, Ca
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembersNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembersNext");
                 scope.Start();
                 try
                 {
@@ -804,7 +804,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GroupsClient.GetGroupMembersNext");
+                using var scope = _clientDiagnostics.CreateScope("GroupsOperations.GetGroupMembersNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs
index b746223fed74c..a834cd36f64f5 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/GroupsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class GroupsRestClient
+    internal partial class GroupsRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class GroupsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of GroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public GroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantOperations.cs
index 690acda537f00..47706149c7fe7 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The OAuth2PermissionGrant service client. </summary>
-    public partial class OAuth2PermissionGrantClient
+    public partial class OAuth2PermissionGrantOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OAuth2PermissionGrantRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OAuth2PermissionGrantClient for mocking. </summary>
-        protected OAuth2PermissionGrantClient()
+        internal OAuth2PermissionGrantRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of OAuth2PermissionGrantOperations for mocking. </summary>
+        protected OAuth2PermissionGrantOperations()
         {
         }
-        /// <summary> Initializes a new instance of OAuth2PermissionGrantClient. </summary>
+        /// <summary> Initializes a new instance of OAuth2PermissionGrantOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal OAuth2PermissionGrantClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal OAuth2PermissionGrantOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new OAuth2PermissionGrantRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new OAuth2PermissionGrantRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal OAuth2PermissionGrantClient(ClientDiagnostics clientDiagnostics, HttpPi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<OAuth2PermissionGrant>> CreateAsync(OAuth2PermissionGrant body = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.Create");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<OAuth2PermissionGrant>> CreateAsync(OAuth2Per
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<OAuth2PermissionGrant> Create(OAuth2PermissionGrant body = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.Create");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response<OAuth2PermissionGrant> Create(OAuth2PermissionGrant body
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.Delete");
             scope.Start();
             try
             {
@@ -97,7 +97,7 @@ public virtual async Task<Response> DeleteAsync(string objectId, CancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.Delete");
             scope.Start();
             try
             {
@@ -117,7 +117,7 @@ public virtual AsyncPageable<OAuth2PermissionGrant> ListAsync(string filter = nu
         {
             async Task<Page<OAuth2PermissionGrant>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.List");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.List");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ async Task<Page<OAuth2PermissionGrant>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OAuth2PermissionGrant>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.List");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.List");
                 scope.Start();
                 try
                 {
@@ -155,7 +155,7 @@ public virtual Pageable<OAuth2PermissionGrant> List(string filter = null, Cancel
         {
             Page<OAuth2PermissionGrant> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.List");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.List");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ Page<OAuth2PermissionGrant> FirstPageFunc(int? pageSizeHint)
             }
             Page<OAuth2PermissionGrant> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.List");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual AsyncPageable<OAuth2PermissionGrant> ListNextAsync(string nextLin
 
             async Task<Page<OAuth2PermissionGrant>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -213,7 +213,7 @@ async Task<Page<OAuth2PermissionGrant>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OAuth2PermissionGrant>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -241,7 +241,7 @@ public virtual Pageable<OAuth2PermissionGrant> ListNext(string nextLink, Cancell
 
             Page<OAuth2PermissionGrant> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -256,7 +256,7 @@ Page<OAuth2PermissionGrant> FirstPageFunc(int? pageSizeHint)
             }
             Page<OAuth2PermissionGrant> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("OAuth2PermissionGrantOperations.ListNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs
index 56c635ff219e7..e7533892f60c9 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/OAuth2PermissionGrantRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class OAuth2PermissionGrantRestClient
+    internal partial class OAuth2PermissionGrantRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class OAuth2PermissionGrantRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OAuth2PermissionGrantRestClient. </summary>
+        /// <summary> Initializes a new instance of OAuth2PermissionGrantRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public OAuth2PermissionGrantRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public OAuth2PermissionGrantRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsOperations.cs
index ddac4b82ccea7..1863e1ecb459c 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The Objects service client. </summary>
-    public partial class ObjectsClient
+    public partial class ObjectsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ObjectsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ObjectsClient for mocking. </summary>
-        protected ObjectsClient()
+        internal ObjectsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ObjectsOperations for mocking. </summary>
+        protected ObjectsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ObjectsClient. </summary>
+        /// <summary> Initializes a new instance of ObjectsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ObjectsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal ObjectsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new ObjectsRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new ObjectsRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -50,7 +50,7 @@ public virtual AsyncPageable<DirectoryObject> GetObjectsByObjectIdsAsync(GetObje
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIds");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIds");
                 scope.Start();
                 try
                 {
@@ -65,7 +65,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIds");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIds");
                 scope.Start();
                 try
                 {
@@ -93,7 +93,7 @@ public virtual Pageable<DirectoryObject> GetObjectsByObjectIds(GetObjectsParamet
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIds");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIds");
                 scope.Start();
                 try
                 {
@@ -108,7 +108,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIds");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIds");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ public virtual AsyncPageable<DirectoryObject> GetObjectsByObjectIdsNextAsync(str
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIdsNext");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIdsNext");
                 scope.Start();
                 try
                 {
@@ -151,7 +151,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIdsNext");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIdsNext");
                 scope.Start();
                 try
                 {
@@ -179,7 +179,7 @@ public virtual Pageable<DirectoryObject> GetObjectsByObjectIdsNext(string nextLi
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIdsNext");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIdsNext");
                 scope.Start();
                 try
                 {
@@ -194,7 +194,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectsClient.GetObjectsByObjectIdsNext");
+                using var scope = _clientDiagnostics.CreateScope("ObjectsOperations.GetObjectsByObjectIdsNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs
index 0bdfaca414c84..180f0d431c616 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ObjectsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class ObjectsRestClient
+    internal partial class ObjectsRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ObjectsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ObjectsRestClient. </summary>
+        /// <summary> Initializes a new instance of ObjectsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ObjectsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public ObjectsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/RbacManagementClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/RbacManagementClient.cs
index 36865a9bf5551..c14f306e3c99b 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/RbacManagementClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/RbacManagementClient.cs
@@ -53,58 +53,31 @@ public RbacManagementClient(string tenantID, Uri endpoint, TokenCredential token
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of SignedInUserClient. </summary>
-        public virtual SignedInUserClient GetSignedInUserClient()
-        {
-            return new SignedInUserClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of SignedInUserOperations. </summary>
+        public virtual SignedInUserOperations SignedInUser => new SignedInUserOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of ApplicationsClient. </summary>
-        public virtual ApplicationsClient GetApplicationsClient()
-        {
-            return new ApplicationsClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationsOperations. </summary>
+        public virtual ApplicationsOperations Applications => new ApplicationsOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of DeletedApplicationsClient. </summary>
-        public virtual DeletedApplicationsClient GetDeletedApplicationsClient()
-        {
-            return new DeletedApplicationsClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of DeletedApplicationsOperations. </summary>
+        public virtual DeletedApplicationsOperations DeletedApplications => new DeletedApplicationsOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of GroupsClient. </summary>
-        public virtual GroupsClient GetGroupsClient()
-        {
-            return new GroupsClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of GroupsOperations. </summary>
+        public virtual GroupsOperations Groups => new GroupsOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of ServicePrincipalsClient. </summary>
-        public virtual ServicePrincipalsClient GetServicePrincipalsClient()
-        {
-            return new ServicePrincipalsClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of ServicePrincipalsOperations. </summary>
+        public virtual ServicePrincipalsOperations ServicePrincipals => new ServicePrincipalsOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of UsersClient. </summary>
-        public virtual UsersClient GetUsersClient()
-        {
-            return new UsersClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of UsersOperations. </summary>
+        public virtual UsersOperations Users => new UsersOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of ObjectsClient. </summary>
-        public virtual ObjectsClient GetObjectsClient()
-        {
-            return new ObjectsClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of ObjectsOperations. </summary>
+        public virtual ObjectsOperations Objects => new ObjectsOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of DomainsClient. </summary>
-        public virtual DomainsClient GetDomainsClient()
-        {
-            return new DomainsClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of DomainsOperations. </summary>
+        public virtual DomainsOperations Domains => new DomainsOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
 
-        /// <summary> Creates a new instance of OAuth2PermissionGrantClient. </summary>
-        public virtual OAuth2PermissionGrantClient GetOAuth2PermissionGrantClient()
-        {
-            return new OAuth2PermissionGrantClient(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
-        }
+        /// <summary> Returns an instance of OAuth2PermissionGrantOperations. </summary>
+        public virtual OAuth2PermissionGrantOperations OAuth2PermissionGrant => new OAuth2PermissionGrantOperations(_clientDiagnostics, _pipeline, _tenantID, _endpoint);
     }
 }
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsOperations.cs
index 5a20272db0b35..eea7b6c5327e0 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The ServicePrincipals service client. </summary>
-    public partial class ServicePrincipalsClient
+    public partial class ServicePrincipalsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServicePrincipalsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServicePrincipalsClient for mocking. </summary>
-        protected ServicePrincipalsClient()
+        internal ServicePrincipalsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServicePrincipalsOperations for mocking. </summary>
+        protected ServicePrincipalsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServicePrincipalsClient. </summary>
+        /// <summary> Initializes a new instance of ServicePrincipalsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ServicePrincipalsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal ServicePrincipalsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new ServicePrincipalsRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new ServicePrincipalsRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ServicePrincipalsClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServicePrincipal>> CreateAsync(ServicePrincipalCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Create");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<ServicePrincipal>> CreateAsync(ServicePrincip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServicePrincipal> Create(ServicePrincipalCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Create");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<ServicePrincipal> Create(ServicePrincipalCreateParameter
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> UpdateAsync(string objectId, ServicePrincipalBase parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Update");
             scope.Start();
             try
             {
@@ -99,7 +99,7 @@ public virtual async Task<Response> UpdateAsync(string objectId, ServicePrincipa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Update(string objectId, ServicePrincipalBase parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Update");
             scope.Start();
             try
             {
@@ -117,7 +117,7 @@ public virtual Response Update(string objectId, ServicePrincipalBase parameters,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Delete");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual async Task<Response> DeleteAsync(string objectId, CancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Delete");
             scope.Start();
             try
             {
@@ -153,7 +153,7 @@ public virtual Response Delete(string objectId, CancellationToken cancellationTo
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServicePrincipal>> GetAsync(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Get");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual async Task<Response<ServicePrincipal>> GetAsync(string objectId,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServicePrincipal> Get(string objectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.Get");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual Response<ServicePrincipal> Get(string objectId, CancellationToken
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> UpdateKeyCredentialsAsync(string objectId, KeyCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.UpdateKeyCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.UpdateKeyCredentials");
             scope.Start();
             try
             {
@@ -209,7 +209,7 @@ public virtual async Task<Response> UpdateKeyCredentialsAsync(string objectId, K
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response UpdateKeyCredentials(string objectId, KeyCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.UpdateKeyCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.UpdateKeyCredentials");
             scope.Start();
             try
             {
@@ -228,7 +228,7 @@ public virtual Response UpdateKeyCredentials(string objectId, KeyCredentialsUpda
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> UpdatePasswordCredentialsAsync(string objectId, PasswordCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.UpdatePasswordCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.UpdatePasswordCredentials");
             scope.Start();
             try
             {
@@ -247,7 +247,7 @@ public virtual async Task<Response> UpdatePasswordCredentialsAsync(string object
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response UpdatePasswordCredentials(string objectId, PasswordCredentialsUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.UpdatePasswordCredentials");
+            using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.UpdatePasswordCredentials");
             scope.Start();
             try
             {
@@ -267,7 +267,7 @@ public virtual AsyncPageable<ServicePrincipal> ListAsync(string filter = null, C
         {
             async Task<Page<ServicePrincipal>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.List");
                 scope.Start();
                 try
                 {
@@ -282,7 +282,7 @@ async Task<Page<ServicePrincipal>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ServicePrincipal>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.List");
                 scope.Start();
                 try
                 {
@@ -305,7 +305,7 @@ public virtual Pageable<ServicePrincipal> List(string filter = null, Cancellatio
         {
             Page<ServicePrincipal> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.List");
                 scope.Start();
                 try
                 {
@@ -320,7 +320,7 @@ Page<ServicePrincipal> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServicePrincipal> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.List");
                 scope.Start();
                 try
                 {
@@ -348,7 +348,7 @@ public virtual AsyncPageable<DirectoryObject> ListOwnersAsync(string objectId, C
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -363,7 +363,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -391,7 +391,7 @@ public virtual Pageable<DirectoryObject> ListOwners(string objectId, Cancellatio
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -406,7 +406,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListOwners");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListOwners");
                 scope.Start();
                 try
                 {
@@ -434,7 +434,7 @@ public virtual AsyncPageable<KeyCredential> ListKeyCredentialsAsync(string objec
 
             async Task<Page<KeyCredential>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListKeyCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListKeyCredentials");
                 scope.Start();
                 try
                 {
@@ -462,7 +462,7 @@ public virtual Pageable<KeyCredential> ListKeyCredentials(string objectId, Cance
 
             Page<KeyCredential> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListKeyCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListKeyCredentials");
                 scope.Start();
                 try
                 {
@@ -490,7 +490,7 @@ public virtual AsyncPageable<PasswordCredential> ListPasswordCredentialsAsync(st
 
             async Task<Page<PasswordCredential>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListPasswordCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListPasswordCredentials");
                 scope.Start();
                 try
                 {
@@ -518,7 +518,7 @@ public virtual Pageable<PasswordCredential> ListPasswordCredentials(string objec
 
             Page<PasswordCredential> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListPasswordCredentials");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListPasswordCredentials");
                 scope.Start();
                 try
                 {
@@ -546,7 +546,7 @@ public virtual AsyncPageable<ServicePrincipal> ListNextAsync(string nextLink, Ca
 
             async Task<Page<ServicePrincipal>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -561,7 +561,7 @@ async Task<Page<ServicePrincipal>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ServicePrincipal>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -589,7 +589,7 @@ public virtual Pageable<ServicePrincipal> ListNext(string nextLink, Cancellation
 
             Page<ServicePrincipal> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -604,7 +604,7 @@ Page<ServicePrincipal> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServicePrincipal> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("ServicePrincipalsOperations.ListNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs
index 3406c38c73e45..a5135be6c807d 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/ServicePrincipalsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class ServicePrincipalsRestClient
+    internal partial class ServicePrincipalsRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ServicePrincipalsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServicePrincipalsRestClient. </summary>
+        /// <summary> Initializes a new instance of ServicePrincipalsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServicePrincipalsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public ServicePrincipalsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserOperations.cs
index eb09b237a929c..d730e930b2ed4 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The SignedInUser service client. </summary>
-    public partial class SignedInUserClient
+    public partial class SignedInUserOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SignedInUserRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SignedInUserClient for mocking. </summary>
-        protected SignedInUserClient()
+        internal SignedInUserRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SignedInUserOperations for mocking. </summary>
+        protected SignedInUserOperations()
         {
         }
-        /// <summary> Initializes a new instance of SignedInUserClient. </summary>
+        /// <summary> Initializes a new instance of SignedInUserOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal SignedInUserClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal SignedInUserOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new SignedInUserRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new SignedInUserRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal SignedInUserClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<User>> GetAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.Get");
             scope.Start();
             try
             {
@@ -59,7 +59,7 @@ public virtual async Task<Response<User>> GetAsync(CancellationToken cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<User> Get(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.Get");
             scope.Start();
             try
             {
@@ -78,7 +78,7 @@ public virtual AsyncPageable<DirectoryObject> ListOwnedObjectsAsync(Cancellation
         {
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjects");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjects");
                 scope.Start();
                 try
                 {
@@ -93,7 +93,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjects");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjects");
                 scope.Start();
                 try
                 {
@@ -115,7 +115,7 @@ public virtual Pageable<DirectoryObject> ListOwnedObjects(CancellationToken canc
         {
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjects");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjects");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjects");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjects");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual AsyncPageable<DirectoryObject> ListOwnedObjectsNextAsync(string n
 
             async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjectsNext");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjectsNext");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ async Task<Page<DirectoryObject>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DirectoryObject>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjectsNext");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjectsNext");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual Pageable<DirectoryObject> ListOwnedObjectsNext(string nextLink, C
 
             Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjectsNext");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjectsNext");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ Page<DirectoryObject> FirstPageFunc(int? pageSizeHint)
             }
             Page<DirectoryObject> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SignedInUserClient.ListOwnedObjectsNext");
+                using var scope = _clientDiagnostics.CreateScope("SignedInUserOperations.ListOwnedObjectsNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs
index 75d698583e098..7db8a9d09a05e 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/SignedInUserRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class SignedInUserRestClient
+    internal partial class SignedInUserRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class SignedInUserRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SignedInUserRestClient. </summary>
+        /// <summary> Initializes a new instance of SignedInUserRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SignedInUserRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public SignedInUserRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersOperations.cs
index 19780d775826e..e4e6125adefef 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Graph.Rbac
 {
     /// <summary> The Users service client. </summary>
-    public partial class UsersClient
+    public partial class UsersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsersClient for mocking. </summary>
-        protected UsersClient()
+        internal UsersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsersOperations for mocking. </summary>
+        protected UsersOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsersClient. </summary>
+        /// <summary> Initializes a new instance of UsersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal UsersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        internal UsersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
-            RestClient = new UsersRestClient(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
+            RestClient = new UsersRestOperations(clientDiagnostics, pipeline, tenantID, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal UsersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<User>> CreateAsync(UserCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Create");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<User>> CreateAsync(UserCreateParameters param
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<User> Create(UserCreateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Create");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response<User> Create(UserCreateParameters parameters, Cancellati
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<User>> GetAsync(string upnOrObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Get");
             scope.Start();
             try
             {
@@ -97,7 +97,7 @@ public virtual async Task<Response<User>> GetAsync(string upnOrObjectId, Cancell
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<User> Get(string upnOrObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Get");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual Response<User> Get(string upnOrObjectId, CancellationToken cancel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> UpdateAsync(string upnOrObjectId, UserUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Update");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual async Task<Response> UpdateAsync(string upnOrObjectId, UserUpdate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Update(string upnOrObjectId, UserUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Update");
             scope.Start();
             try
             {
@@ -153,7 +153,7 @@ public virtual Response Update(string upnOrObjectId, UserUpdateParameters parame
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string upnOrObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Delete");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual async Task<Response> DeleteAsync(string upnOrObjectId, Cancellati
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string upnOrObjectId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("UsersClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("UsersOperations.Delete");
             scope.Start();
             try
             {
@@ -191,7 +191,7 @@ public virtual AsyncPageable<User> ListAsync(string filter = null, CancellationT
         {
             async Task<Page<User>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.List");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ async Task<Page<User>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<User>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.List");
                 scope.Start();
                 try
                 {
@@ -229,7 +229,7 @@ public virtual Pageable<User> List(string filter = null, CancellationToken cance
         {
             Page<User> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ Page<User> FirstPageFunc(int? pageSizeHint)
             }
             Page<User> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.List");
                 scope.Start();
                 try
                 {
@@ -277,7 +277,7 @@ public virtual AsyncPageable<string> GetMemberGroupsAsync(string objectId, UserG
 
             async Task<Page<string>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.GetMemberGroups");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.GetMemberGroups");
                 scope.Start();
                 try
                 {
@@ -310,7 +310,7 @@ public virtual Pageable<string> GetMemberGroups(string objectId, UserGetMemberGr
 
             Page<string> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.GetMemberGroups");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.GetMemberGroups");
                 scope.Start();
                 try
                 {
@@ -338,7 +338,7 @@ public virtual AsyncPageable<User> ListNextAsync(string nextLink, CancellationTo
 
             async Task<Page<User>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -353,7 +353,7 @@ async Task<Page<User>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<User>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -381,7 +381,7 @@ public virtual Pageable<User> ListNext(string nextLink, CancellationToken cancel
 
             Page<User> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.ListNext");
                 scope.Start();
                 try
                 {
@@ -396,7 +396,7 @@ Page<User> FirstPageFunc(int? pageSizeHint)
             }
             Page<User> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsersClient.ListNext");
+                using var scope = _clientDiagnostics.CreateScope("UsersOperations.ListNext");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestClient.cs b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestClient.cs
rename to sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs
index 63148774e6894..c98af1a46b077 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestClient.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/src/Generated/UsersRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Graph.Rbac
 {
-    internal partial class UsersRestClient
+    internal partial class UsersRestOperations
     {
         private string tenantID;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class UsersRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsersRestClient. </summary>
+        /// <summary> Initializes a new instance of UsersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="tenantID"> The tenant ID. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
+        public UsersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string tenantID, Uri endpoint = null, string apiVersion = "1.6")
         {
             if (tenantID == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsOperations.cs
index 325966d585748..c092862d222b4 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The AvailabilitySets service client. </summary>
-    public partial class AvailabilitySetsClient
+    public partial class AvailabilitySetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailabilitySetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailabilitySetsClient for mocking. </summary>
-        protected AvailabilitySetsClient()
+        internal AvailabilitySetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailabilitySetsOperations for mocking. </summary>
+        protected AvailabilitySetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailabilitySetsClient. </summary>
+        /// <summary> Initializes a new instance of AvailabilitySetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailabilitySetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailabilitySetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailabilitySetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailabilitySetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal AvailabilitySetsClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailabilitySet>> CreateOrUpdateAsync(string resourceGroupName, string availabilitySetName, AvailabilitySet parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<AvailabilitySet>> CreateOrUpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailabilitySet> CreateOrUpdate(string resourceGroupName, string availabilitySetName, AvailabilitySet parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<AvailabilitySet> CreateOrUpdate(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailabilitySet>> UpdateAsync(string resourceGroupName, string availabilitySetName, AvailabilitySetUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<AvailabilitySet>> UpdateAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailabilitySet> Update(string resourceGroupName, string availabilitySetName, AvailabilitySetUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<AvailabilitySet> Update(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Delete");
             scope.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response Delete(string resourceGroupName, string availabilitySetN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AvailabilitySet>> GetAsync(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Get");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<AvailabilitySet>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AvailabilitySet> Get(string resourceGroupName, string availabilitySetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.Get");
             scope.Start();
             try
             {
@@ -200,7 +200,7 @@ public virtual AsyncPageable<AvailabilitySet> ListBySubscriptionAsync(string exp
         {
             async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailabilitySet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -238,7 +238,7 @@ public virtual Pageable<AvailabilitySet> ListBySubscription(string expand = null
         {
             Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -253,7 +253,7 @@ Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailabilitySet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -281,7 +281,7 @@ public virtual AsyncPageable<AvailabilitySet> ListAsync(string resourceGroupName
 
             async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -296,7 +296,7 @@ async Task<Page<AvailabilitySet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailabilitySet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -324,7 +324,7 @@ public virtual Pageable<AvailabilitySet> List(string resourceGroupName, Cancella
 
             Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -339,7 +339,7 @@ Page<AvailabilitySet> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailabilitySet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -372,7 +372,7 @@ public virtual AsyncPageable<VirtualMachineSize> ListAvailableSizesAsync(string
 
             async Task<Page<VirtualMachineSize>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
@@ -405,7 +405,7 @@ public virtual Pageable<VirtualMachineSize> ListAvailableSizes(string resourceGr
 
             Page<VirtualMachineSize> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("AvailabilitySetsOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsRestOperations.cs
index 2f6f1419c2596..252e08e35faea 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/AvailabilitySetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class AvailabilitySetsRestClient
+    internal partial class AvailabilitySetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailabilitySetsRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailabilitySetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailabilitySetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailabilitySetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ComputeManagementClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ComputeManagementClient.cs
index cf1dfcd1d40c5..38d67b7129338 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ComputeManagementClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ComputeManagementClient.cs
@@ -53,184 +53,94 @@ public ComputeManagementClient(Uri endpoint, string subscriptionId, TokenCredent
             _subscriptionId = subscriptionId;
         }
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of AvailabilitySetsClient. </summary>
-        public virtual AvailabilitySetsClient GetAvailabilitySetsClient()
-        {
-            return new AvailabilitySetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailabilitySetsOperations. </summary>
+        public virtual AvailabilitySetsOperations AvailabilitySets => new AvailabilitySetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ProximityPlacementGroupsClient. </summary>
-        public virtual ProximityPlacementGroupsClient GetProximityPlacementGroupsClient()
-        {
-            return new ProximityPlacementGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ProximityPlacementGroupsOperations. </summary>
+        public virtual ProximityPlacementGroupsOperations ProximityPlacementGroups => new ProximityPlacementGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DedicatedHostGroupsClient. </summary>
-        public virtual DedicatedHostGroupsClient GetDedicatedHostGroupsClient()
-        {
-            return new DedicatedHostGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DedicatedHostGroupsOperations. </summary>
+        public virtual DedicatedHostGroupsOperations DedicatedHostGroups => new DedicatedHostGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DedicatedHostsClient. </summary>
-        public virtual DedicatedHostsClient GetDedicatedHostsClient()
-        {
-            return new DedicatedHostsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DedicatedHostsOperations. </summary>
+        public virtual DedicatedHostsOperations DedicatedHosts => new DedicatedHostsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SshPublicKeysClient. </summary>
-        public virtual SshPublicKeysClient GetSshPublicKeysClient()
-        {
-            return new SshPublicKeysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SshPublicKeysOperations. </summary>
+        public virtual SshPublicKeysOperations SshPublicKeys => new SshPublicKeysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineExtensionImagesClient. </summary>
-        public virtual VirtualMachineExtensionImagesClient GetVirtualMachineExtensionImagesClient()
-        {
-            return new VirtualMachineExtensionImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineExtensionImagesOperations. </summary>
+        public virtual VirtualMachineExtensionImagesOperations VirtualMachineExtensionImages => new VirtualMachineExtensionImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineExtensionsClient. </summary>
-        public virtual VirtualMachineExtensionsClient GetVirtualMachineExtensionsClient()
-        {
-            return new VirtualMachineExtensionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineExtensionsOperations. </summary>
+        public virtual VirtualMachineExtensionsOperations VirtualMachineExtensions => new VirtualMachineExtensionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineImagesClient. </summary>
-        public virtual VirtualMachineImagesClient GetVirtualMachineImagesClient()
-        {
-            return new VirtualMachineImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineImagesOperations. </summary>
+        public virtual VirtualMachineImagesOperations VirtualMachineImages => new VirtualMachineImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of UsageClient. </summary>
-        public virtual UsageClient GetUsageClient()
-        {
-            return new UsageClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of UsageOperations. </summary>
+        public virtual UsageOperations Usage => new UsageOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachinesClient. </summary>
-        public virtual VirtualMachinesClient GetVirtualMachinesClient()
-        {
-            return new VirtualMachinesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachinesOperations. </summary>
+        public virtual VirtualMachinesOperations VirtualMachines => new VirtualMachinesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineSizesClient. </summary>
-        public virtual VirtualMachineSizesClient GetVirtualMachineSizesClient()
-        {
-            return new VirtualMachineSizesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineSizesOperations. </summary>
+        public virtual VirtualMachineSizesOperations VirtualMachineSizes => new VirtualMachineSizesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ImagesClient. </summary>
-        public virtual ImagesClient GetImagesClient()
-        {
-            return new ImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ImagesOperations. </summary>
+        public virtual ImagesOperations Images => new ImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetsClient. </summary>
-        public virtual VirtualMachineScaleSetsClient GetVirtualMachineScaleSetsClient()
-        {
-            return new VirtualMachineScaleSetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetsOperations. </summary>
+        public virtual VirtualMachineScaleSetsOperations VirtualMachineScaleSets => new VirtualMachineScaleSetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetExtensionsClient. </summary>
-        public virtual VirtualMachineScaleSetExtensionsClient GetVirtualMachineScaleSetExtensionsClient()
-        {
-            return new VirtualMachineScaleSetExtensionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetExtensionsOperations. </summary>
+        public virtual VirtualMachineScaleSetExtensionsOperations VirtualMachineScaleSetExtensions => new VirtualMachineScaleSetExtensionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetRollingUpgradesClient. </summary>
-        public virtual VirtualMachineScaleSetRollingUpgradesClient GetVirtualMachineScaleSetRollingUpgradesClient()
-        {
-            return new VirtualMachineScaleSetRollingUpgradesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetRollingUpgradesOperations. </summary>
+        public virtual VirtualMachineScaleSetRollingUpgradesOperations VirtualMachineScaleSetRollingUpgrades => new VirtualMachineScaleSetRollingUpgradesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetVMExtensionsClient. </summary>
-        public virtual VirtualMachineScaleSetVMExtensionsClient GetVirtualMachineScaleSetVMExtensionsClient()
-        {
-            return new VirtualMachineScaleSetVMExtensionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetVMExtensionsOperations. </summary>
+        public virtual VirtualMachineScaleSetVMExtensionsOperations VirtualMachineScaleSetVMExtensions => new VirtualMachineScaleSetVMExtensionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineScaleSetVMsClient. </summary>
-        public virtual VirtualMachineScaleSetVMsClient GetVirtualMachineScaleSetVMsClient()
-        {
-            return new VirtualMachineScaleSetVMsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineScaleSetVMsOperations. </summary>
+        public virtual VirtualMachineScaleSetVMsOperations VirtualMachineScaleSetVMs => new VirtualMachineScaleSetVMsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LogAnalyticsClient. </summary>
-        public virtual LogAnalyticsClient GetLogAnalyticsClient()
-        {
-            return new LogAnalyticsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LogAnalyticsOperations. </summary>
+        public virtual LogAnalyticsOperations LogAnalytics => new LogAnalyticsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualMachineRunCommandsClient. </summary>
-        public virtual VirtualMachineRunCommandsClient GetVirtualMachineRunCommandsClient()
-        {
-            return new VirtualMachineRunCommandsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualMachineRunCommandsOperations. </summary>
+        public virtual VirtualMachineRunCommandsOperations VirtualMachineRunCommands => new VirtualMachineRunCommandsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceSkusClient. </summary>
-        public virtual ResourceSkusClient GetResourceSkusClient()
-        {
-            return new ResourceSkusClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceSkusOperations. </summary>
+        public virtual ResourceSkusOperations ResourceSkus => new ResourceSkusOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DisksClient. </summary>
-        public virtual DisksClient GetDisksClient()
-        {
-            return new DisksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DisksOperations. </summary>
+        public virtual DisksOperations Disks => new DisksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SnapshotsClient. </summary>
-        public virtual SnapshotsClient GetSnapshotsClient()
-        {
-            return new SnapshotsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SnapshotsOperations. </summary>
+        public virtual SnapshotsOperations Snapshots => new SnapshotsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DiskEncryptionSetsClient. </summary>
-        public virtual DiskEncryptionSetsClient GetDiskEncryptionSetsClient()
-        {
-            return new DiskEncryptionSetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DiskEncryptionSetsOperations. </summary>
+        public virtual DiskEncryptionSetsOperations DiskEncryptionSets => new DiskEncryptionSetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleriesClient. </summary>
-        public virtual GalleriesClient GetGalleriesClient()
-        {
-            return new GalleriesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleriesOperations. </summary>
+        public virtual GalleriesOperations Galleries => new GalleriesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryImagesClient. </summary>
-        public virtual GalleryImagesClient GetGalleryImagesClient()
-        {
-            return new GalleryImagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryImagesOperations. </summary>
+        public virtual GalleryImagesOperations GalleryImages => new GalleryImagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryImageVersionsClient. </summary>
-        public virtual GalleryImageVersionsClient GetGalleryImageVersionsClient()
-        {
-            return new GalleryImageVersionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryImageVersionsOperations. </summary>
+        public virtual GalleryImageVersionsOperations GalleryImageVersions => new GalleryImageVersionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryApplicationsClient. </summary>
-        public virtual GalleryApplicationsClient GetGalleryApplicationsClient()
-        {
-            return new GalleryApplicationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryApplicationsOperations. </summary>
+        public virtual GalleryApplicationsOperations GalleryApplications => new GalleryApplicationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of GalleryApplicationVersionsClient. </summary>
-        public virtual GalleryApplicationVersionsClient GetGalleryApplicationVersionsClient()
-        {
-            return new GalleryApplicationVersionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of GalleryApplicationVersionsOperations. </summary>
+        public virtual GalleryApplicationVersionsOperations GalleryApplicationVersions => new GalleryApplicationVersionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ContainerServicesClient. </summary>
-        public virtual ContainerServicesClient GetContainerServicesClient()
-        {
-            return new ContainerServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ContainerServicesOperations. </summary>
+        public virtual ContainerServicesOperations ContainerServices => new ContainerServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesOperations.cs
index 079592ccb163e..b953d3e84a413 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The ContainerServices service client. </summary>
-    public partial class ContainerServicesClient
+    public partial class ContainerServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ContainerServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ContainerServicesClient for mocking. </summary>
-        protected ContainerServicesClient()
+        internal ContainerServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ContainerServicesOperations for mocking. </summary>
+        protected ContainerServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ContainerServicesClient. </summary>
+        /// <summary> Initializes a new instance of ContainerServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ContainerServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ContainerServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ContainerServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ContainerServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ContainerServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ContainerService>> GetAsync(string resourceGroupName, string containerServiceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ContainerService>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ContainerService> Get(string resourceGroupName, string containerServiceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual AsyncPageable<ContainerService> ListAsync(CancellationToken cance
         {
             async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -96,7 +96,7 @@ async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ContainerService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -118,7 +118,7 @@ public virtual Pageable<ContainerService> List(CancellationToken cancellationTok
         {
             Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -133,7 +133,7 @@ Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             }
             Page<ContainerService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -161,7 +161,7 @@ public virtual AsyncPageable<ContainerService> ListByResourceGroupAsync(string r
 
             async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -176,7 +176,7 @@ async Task<Page<ContainerService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ContainerService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<ContainerService> ListByResourceGroup(string resourceGro
 
             Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<ContainerService> FirstPageFunc(int? pageSizeHint)
             }
             Page<ContainerService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<ContainerServicesCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual ContainerServicesCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -318,7 +318,7 @@ public virtual async Task<ContainerServicesDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(containerServiceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual ContainerServicesDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(containerServiceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ContainerServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ContainerServicesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesRestOperations.cs
index ecf57fefc31d2..2965d6d38d457 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ContainerServicesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class ContainerServicesRestClient
+    internal partial class ContainerServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ContainerServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of ContainerServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ContainerServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ContainerServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsOperations.cs
similarity index 92%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsOperations.cs
index 4a904fd9b67b4..fcdc63b65ac25 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The DedicatedHostGroups service client. </summary>
-    public partial class DedicatedHostGroupsClient
+    public partial class DedicatedHostGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DedicatedHostGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DedicatedHostGroupsClient for mocking. </summary>
-        protected DedicatedHostGroupsClient()
+        internal DedicatedHostGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DedicatedHostGroupsOperations for mocking. </summary>
+        protected DedicatedHostGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DedicatedHostGroupsClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DedicatedHostGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DedicatedHostGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DedicatedHostGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DedicatedHostGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DedicatedHostGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHostGroup>> CreateOrUpdateAsync(string resourceGroupName, string hostGroupName, DedicatedHostGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<DedicatedHostGroup>> CreateOrUpdateAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHostGroup> CreateOrUpdate(string resourceGroupName, string hostGroupName, DedicatedHostGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<DedicatedHostGroup> CreateOrUpdate(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHostGroup>> UpdateAsync(string resourceGroupName, string hostGroupName, DedicatedHostGroupUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<DedicatedHostGroup>> UpdateAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHostGroup> Update(string resourceGroupName, string hostGroupName, DedicatedHostGroupUpdate parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<DedicatedHostGroup> Update(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response Delete(string resourceGroupName, string hostGroupName, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHostGroup>> GetAsync(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<DedicatedHostGroup>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHostGroup> Get(string resourceGroupName, string hostGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual AsyncPageable<DedicatedHostGroup> ListByResourceGroupAsync(string
 
             async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -220,7 +220,7 @@ async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DedicatedHostGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual Pageable<DedicatedHostGroup> ListByResourceGroup(string resourceG
 
             Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<DedicatedHostGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -285,7 +285,7 @@ public virtual AsyncPageable<DedicatedHostGroup> ListBySubscriptionAsync(Cancell
         {
             async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -300,7 +300,7 @@ async Task<Page<DedicatedHostGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DedicatedHostGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -322,7 +322,7 @@ public virtual Pageable<DedicatedHostGroup> ListBySubscription(CancellationToken
         {
             Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -337,7 +337,7 @@ Page<DedicatedHostGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<DedicatedHostGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsRestOperations.cs
index 4dd2589e7f99a..2d6da6dca03cb 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class DedicatedHostGroupsRestClient
+    internal partial class DedicatedHostGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DedicatedHostGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DedicatedHostGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DedicatedHostGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsOperations.cs
index 3c74a3a4ee441..d1635d1b458a6 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The DedicatedHosts service client. </summary>
-    public partial class DedicatedHostsClient
+    public partial class DedicatedHostsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DedicatedHostsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DedicatedHostsClient for mocking. </summary>
-        protected DedicatedHostsClient()
+        internal DedicatedHostsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DedicatedHostsOperations for mocking. </summary>
+        protected DedicatedHostsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DedicatedHostsClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DedicatedHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DedicatedHostsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DedicatedHostsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DedicatedHostsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DedicatedHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DedicatedHost>> GetAsync(string resourceGroupName, string hostGroupName, string hostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<DedicatedHost>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DedicatedHost> Get(string resourceGroupName, string hostGroupName, string hostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<DedicatedHost> ListByHostGroupAsync(string resource
 
             async Task<Page<DedicatedHost>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<DedicatedHost>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DedicatedHost>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<DedicatedHost> ListByHostGroup(string resourceGroupName,
 
             Page<DedicatedHost> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<DedicatedHost> FirstPageFunc(int? pageSizeHint)
             }
             Page<DedicatedHost> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.ListByHostGroup");
+                using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.ListByHostGroup");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<DedicatedHostsCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual DedicatedHostsCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual async Task<DedicatedHostsUpdateOperation> StartUpdateAsync(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual DedicatedHostsUpdateOperation StartUpdate(string resourceGroupNam
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<DedicatedHostsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(hostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual DedicatedHostsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(hostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DedicatedHostsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsRestOperations.cs
index 4e3ca0b3b1ac2..b5dd804ee19fe 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DedicatedHostsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class DedicatedHostsRestClient
+    internal partial class DedicatedHostsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DedicatedHostsRestClient. </summary>
+        /// <summary> Initializes a new instance of DedicatedHostsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DedicatedHostsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DedicatedHostsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsOperations.cs
index c877fd788a2ea..5c7f039d73c57 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The DiskEncryptionSets service client. </summary>
-    public partial class DiskEncryptionSetsClient
+    public partial class DiskEncryptionSetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DiskEncryptionSetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DiskEncryptionSetsClient for mocking. </summary>
-        protected DiskEncryptionSetsClient()
+        internal DiskEncryptionSetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DiskEncryptionSetsOperations for mocking. </summary>
+        protected DiskEncryptionSetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DiskEncryptionSetsClient. </summary>
+        /// <summary> Initializes a new instance of DiskEncryptionSetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DiskEncryptionSetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DiskEncryptionSetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DiskEncryptionSetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DiskEncryptionSetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DiskEncryptionSetsClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DiskEncryptionSet>> GetAsync(string resourceGroupName, string diskEncryptionSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<DiskEncryptionSet>> GetAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DiskEncryptionSet> Get(string resourceGroupName, string diskEncryptionSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<DiskEncryptionSet> ListByResourceGroupAsync(string
 
             async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DiskEncryptionSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<DiskEncryptionSet> ListByResourceGroup(string resourceGr
 
             Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<DiskEncryptionSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<DiskEncryptionSet> ListAsync(CancellationToken canc
         {
             async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<DiskEncryptionSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DiskEncryptionSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<DiskEncryptionSet> List(CancellationToken cancellationTo
         {
             Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<DiskEncryptionSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<DiskEncryptionSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<DiskEncryptionSetsCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual DiskEncryptionSetsCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<DiskEncryptionSetsUpdateOperation> StartUpdateAsync(st
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual DiskEncryptionSetsUpdateOperation StartUpdate(string resourceGrou
                 throw new ArgumentNullException(nameof(diskEncryptionSet));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<DiskEncryptionSetsDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(diskEncryptionSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual DiskEncryptionSetsDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(diskEncryptionSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DiskEncryptionSetsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsRestOperations.cs
index eddf5ff60c964..62c4ae65d8ab5 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DiskEncryptionSetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class DiskEncryptionSetsRestClient
+    internal partial class DiskEncryptionSetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DiskEncryptionSetsRestClient. </summary>
+        /// <summary> Initializes a new instance of DiskEncryptionSetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DiskEncryptionSetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DiskEncryptionSetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksOperations.cs
index f60b8f20cc80e..3671acb64316d 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The Disks service client. </summary>
-    public partial class DisksClient
+    public partial class DisksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DisksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DisksClient for mocking. </summary>
-        protected DisksClient()
+        internal DisksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DisksOperations for mocking. </summary>
+        protected DisksOperations()
         {
         }
-        /// <summary> Initializes a new instance of DisksClient. </summary>
+        /// <summary> Initializes a new instance of DisksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DisksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DisksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DisksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DisksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DisksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Disk>> GetAsync(string resourceGroupName, string diskName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Disk>> GetAsync(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Disk> Get(string resourceGroupName, string diskName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<Disk> ListByResourceGroupAsync(string resourceGroup
 
             async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Disk>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<Disk> ListByResourceGroup(string resourceGroupName, Canc
 
             Page<Disk> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<Disk> FirstPageFunc(int? pageSizeHint)
             }
             Page<Disk> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<Disk> ListAsync(CancellationToken cancellationToken
         {
             async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<Disk>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Disk>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<Disk> List(CancellationToken cancellationToken = default
         {
             Page<Disk> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<Disk> FirstPageFunc(int? pageSizeHint)
             }
             Page<Disk> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DisksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DisksOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<DisksCreateOrUpdateOperation> StartCreateOrUpdateAsync
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual DisksCreateOrUpdateOperation StartCreateOrUpdate(string resourceG
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<DisksUpdateOperation> StartUpdateAsync(string resource
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual DisksUpdateOperation StartUpdate(string resourceGroupName, string
                 throw new ArgumentNullException(nameof(disk));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<DisksDeleteOperation> StartDeleteAsync(string resource
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual DisksDeleteOperation StartDelete(string resourceGroupName, string
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -449,7 +449,7 @@ public virtual async Task<DisksGrantAccessOperation> StartGrantAccessAsync(strin
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -483,7 +483,7 @@ public virtual DisksGrantAccessOperation StartGrantAccess(string resourceGroupNa
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -512,7 +512,7 @@ public virtual async Task<DisksRevokeAccessOperation> StartRevokeAccessAsync(str
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartRevokeAccess");
             scope.Start();
             try
             {
@@ -541,7 +541,7 @@ public virtual DisksRevokeAccessOperation StartRevokeAccess(string resourceGroup
                 throw new ArgumentNullException(nameof(diskName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DisksClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("DisksOperations.StartRevokeAccess");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksRestOperations.cs
index febd33e79dc46..9a3259baf79bd 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/DisksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class DisksRestClient
+    internal partial class DisksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DisksRestClient. </summary>
+        /// <summary> Initializes a new instance of DisksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DisksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DisksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesOperations.cs
index c9f657d93b40a..173a19dfbf745 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The Galleries service client. </summary>
-    public partial class GalleriesClient
+    public partial class GalleriesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleriesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleriesClient for mocking. </summary>
-        protected GalleriesClient()
+        internal GalleriesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleriesOperations for mocking. </summary>
+        protected GalleriesOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleriesClient. </summary>
+        /// <summary> Initializes a new instance of GalleriesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleriesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleriesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleriesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleriesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal GalleriesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Gallery>> GetAsync(string resourceGroupName, string galleryName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Gallery>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Gallery> Get(string resourceGroupName, string galleryName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<Gallery> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Gallery>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<Gallery> ListByResourceGroup(string resourceGroupName, C
 
             Page<Gallery> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<Gallery> FirstPageFunc(int? pageSizeHint)
             }
             Page<Gallery> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<Gallery> ListAsync(CancellationToken cancellationTo
         {
             async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<Gallery>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Gallery>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<Gallery> List(CancellationToken cancellationToken = defa
         {
             Page<Gallery> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<Gallery> FirstPageFunc(int? pageSizeHint)
             }
             Page<Gallery> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleriesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<GalleriesCreateOrUpdateOperation> StartCreateOrUpdateA
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual GalleriesCreateOrUpdateOperation StartCreateOrUpdate(string resou
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<GalleriesUpdateOperation> StartUpdateAsync(string reso
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual GalleriesUpdateOperation StartUpdate(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(gallery));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<GalleriesDeleteOperation> StartDeleteAsync(string reso
                 throw new ArgumentNullException(nameof(galleryName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual GalleriesDeleteOperation StartDelete(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(galleryName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleriesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleriesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesRestOperations.cs
index f6dc565cf2a8a..e9d43adb342f9 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleriesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class GalleriesRestClient
+    internal partial class GalleriesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleriesRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleriesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleriesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleriesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsOperations.cs
index 0303750a0fa0f..9c86b9a42e03e 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The GalleryApplicationVersions service client. </summary>
-    public partial class GalleryApplicationVersionsClient
+    public partial class GalleryApplicationVersionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryApplicationVersionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryApplicationVersionsClient for mocking. </summary>
-        protected GalleryApplicationVersionsClient()
+        internal GalleryApplicationVersionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryApplicationVersionsOperations for mocking. </summary>
+        protected GalleryApplicationVersionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryApplicationVersionsClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationVersionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryApplicationVersionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryApplicationVersionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryApplicationVersionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryApplicationVersionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal GalleryApplicationVersionsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryApplicationVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<GalleryApplicationVersion>> GetAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryApplicationVersion> Get(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<GalleryApplicationVersion> ListByGalleryApplication
 
             async Task<Page<GalleryApplicationVersion>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<GalleryApplicationVersion>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryApplicationVersion>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<GalleryApplicationVersion> ListByGalleryApplication(stri
 
             Page<GalleryApplicationVersion> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<GalleryApplicationVersion> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryApplicationVersion> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.ListByGalleryApplication");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.ListByGalleryApplication");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ public virtual async Task<GalleryApplicationVersionsCreateOrUpdateOperation> Sta
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -259,7 +259,7 @@ public virtual GalleryApplicationVersionsCreateOrUpdateOperation StartCreateOrUp
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -303,7 +303,7 @@ public virtual async Task<GalleryApplicationVersionsUpdateOperation> StartUpdate
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual GalleryApplicationVersionsUpdateOperation StartUpdate(string reso
                 throw new ArgumentNullException(nameof(galleryApplicationVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<GalleryApplicationVersionsDeleteOperation> StartDelete
                 throw new ArgumentNullException(nameof(galleryApplicationVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -425,7 +425,7 @@ public virtual GalleryApplicationVersionsDeleteOperation StartDelete(string reso
                 throw new ArgumentNullException(nameof(galleryApplicationVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationVersionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsRestOperations.cs
index 24c19a946f30c..2476eec809330 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationVersionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class GalleryApplicationVersionsRestClient
+    internal partial class GalleryApplicationVersionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryApplicationVersionsRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationVersionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryApplicationVersionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryApplicationVersionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsOperations.cs
index 3a7d6e466df44..f4392c9354d23 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The GalleryApplications service client. </summary>
-    public partial class GalleryApplicationsClient
+    public partial class GalleryApplicationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryApplicationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryApplicationsClient for mocking. </summary>
-        protected GalleryApplicationsClient()
+        internal GalleryApplicationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryApplicationsOperations for mocking. </summary>
+        protected GalleryApplicationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryApplicationsClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryApplicationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryApplicationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryApplicationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal GalleryApplicationsClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryApplication>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<GalleryApplication>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryApplication> Get(string resourceGroupName, string galleryName, string galleryApplicationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<GalleryApplication> ListByGalleryAsync(string resou
 
             async Task<Page<GalleryApplication>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<GalleryApplication>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryApplication>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<GalleryApplication> ListByGallery(string resourceGroupNa
 
             Page<GalleryApplication> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<GalleryApplication> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryApplication> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<GalleryApplicationsCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual GalleryApplicationsCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual async Task<GalleryApplicationsUpdateOperation> StartUpdateAsync(s
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual GalleryApplicationsUpdateOperation StartUpdate(string resourceGro
                 throw new ArgumentNullException(nameof(galleryApplication));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<GalleryApplicationsDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(galleryApplicationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual GalleryApplicationsDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(galleryApplicationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryApplicationsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsRestOperations.cs
index e8a5304a3ab4d..cfd10876214ba 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryApplicationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class GalleryApplicationsRestClient
+    internal partial class GalleryApplicationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryApplicationsRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryApplicationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryApplicationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryApplicationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsOperations.cs
index 01f0fe9675cdf..425d2a8acb898 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The GalleryImageVersions service client. </summary>
-    public partial class GalleryImageVersionsClient
+    public partial class GalleryImageVersionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryImageVersionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryImageVersionsClient for mocking. </summary>
-        protected GalleryImageVersionsClient()
+        internal GalleryImageVersionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryImageVersionsOperations for mocking. </summary>
+        protected GalleryImageVersionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryImageVersionsClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImageVersionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryImageVersionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryImageVersionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryImageVersionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryImageVersionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal GalleryImageVersionsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryImageVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<GalleryImageVersion>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryImageVersion> Get(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<GalleryImageVersion> ListByGalleryImageAsync(string
 
             async Task<Page<GalleryImageVersion>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<GalleryImageVersion>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryImageVersion>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<GalleryImageVersion> ListByGalleryImage(string resourceG
 
             Page<GalleryImageVersion> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<GalleryImageVersion> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryImageVersion> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.ListByGalleryImage");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.ListByGalleryImage");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ public virtual async Task<GalleryImageVersionsCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -259,7 +259,7 @@ public virtual GalleryImageVersionsCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -303,7 +303,7 @@ public virtual async Task<GalleryImageVersionsUpdateOperation> StartUpdateAsync(
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual GalleryImageVersionsUpdateOperation StartUpdate(string resourceGr
                 throw new ArgumentNullException(nameof(galleryImageVersion));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<GalleryImageVersionsDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(galleryImageVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -425,7 +425,7 @@ public virtual GalleryImageVersionsDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(galleryImageVersionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImageVersionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsRestOperations.cs
index d16e81df778c5..d194d512bce8e 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImageVersionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class GalleryImageVersionsRestClient
+    internal partial class GalleryImageVersionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryImageVersionsRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImageVersionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryImageVersionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryImageVersionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesOperations.cs
index 9af20f8ca6274..c9e0a233aaad7 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The GalleryImages service client. </summary>
-    public partial class GalleryImagesClient
+    public partial class GalleryImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal GalleryImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of GalleryImagesClient for mocking. </summary>
-        protected GalleryImagesClient()
+        internal GalleryImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of GalleryImagesOperations for mocking. </summary>
+        protected GalleryImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of GalleryImagesClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal GalleryImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal GalleryImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new GalleryImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new GalleryImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal GalleryImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GalleryImage>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<GalleryImage>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GalleryImage> Get(string resourceGroupName, string galleryName, string galleryImageName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<GalleryImage> ListByGalleryAsync(string resourceGro
 
             async Task<Page<GalleryImage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<GalleryImage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GalleryImage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<GalleryImage> ListByGallery(string resourceGroupName, st
 
             Page<GalleryImage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<GalleryImage> FirstPageFunc(int? pageSizeHint)
             }
             Page<GalleryImage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.ListByGallery");
+                using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.ListByGallery");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<GalleryImagesCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual GalleryImagesCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -276,7 +276,7 @@ public virtual async Task<GalleryImagesUpdateOperation> StartUpdateAsync(string
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual GalleryImagesUpdateOperation StartUpdate(string resourceGroupName
                 throw new ArgumentNullException(nameof(galleryImage));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<GalleryImagesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(galleryImageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual GalleryImagesDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(galleryImageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("GalleryImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("GalleryImagesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesRestOperations.cs
index 2edf567134f71..064ceab987d10 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/GalleryImagesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class GalleryImagesRestClient
+    internal partial class GalleryImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of GalleryImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of GalleryImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public GalleryImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public GalleryImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesOperations.cs
index e02be4cf69138..8c4e4cae55575 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The Images service client. </summary>
-    public partial class ImagesClient
+    public partial class ImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ImagesClient for mocking. </summary>
-        protected ImagesClient()
+        internal ImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ImagesOperations for mocking. </summary>
+        protected ImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ImagesClient. </summary>
+        /// <summary> Initializes a new instance of ImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Image>> GetAsync(string resourceGroupName, string imageName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<Image>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Image> Get(string resourceGroupName, string imageName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<Image> ListByResourceGroupAsync(string resourceGrou
 
             async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Image>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<Image> ListByResourceGroup(string resourceGroupName, Can
 
             Page<Image> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<Image> FirstPageFunc(int? pageSizeHint)
             }
             Page<Image> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<Image> ListAsync(CancellationToken cancellationToke
         {
             async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<Image>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Image>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<Image> List(CancellationToken cancellationToken = defaul
         {
             Page<Image> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<Image> FirstPageFunc(int? pageSizeHint)
             }
             Page<Image> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ImagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ImagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -257,7 +257,7 @@ public virtual async Task<ImagesCreateOrUpdateOperation> StartCreateOrUpdateAsyn
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -291,7 +291,7 @@ public virtual ImagesCreateOrUpdateOperation StartCreateOrUpdate(string resource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -325,7 +325,7 @@ public virtual async Task<ImagesUpdateOperation> StartUpdateAsync(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -359,7 +359,7 @@ public virtual ImagesUpdateOperation StartUpdate(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -388,7 +388,7 @@ public virtual async Task<ImagesDeleteOperation> StartDeleteAsync(string resourc
                 throw new ArgumentNullException(nameof(imageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -417,7 +417,7 @@ public virtual ImagesDeleteOperation StartDelete(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(imageName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ImagesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ImagesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesRestOperations.cs
index 55ba5a1a52870..a450b739798d5 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ImagesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class ImagesRestClient
+    internal partial class ImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of ImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsOperations.cs
index 3e1df836c8749..290287bb14872 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsOperations.cs
@@ -14,23 +14,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The LogAnalytics service client. </summary>
-    public partial class LogAnalyticsClient
+    public partial class LogAnalyticsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LogAnalyticsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LogAnalyticsClient for mocking. </summary>
-        protected LogAnalyticsClient()
+        internal LogAnalyticsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LogAnalyticsOperations for mocking. </summary>
+        protected LogAnalyticsOperations()
         {
         }
-        /// <summary> Initializes a new instance of LogAnalyticsClient. </summary>
+        /// <summary> Initializes a new instance of LogAnalyticsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LogAnalyticsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LogAnalyticsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LogAnalyticsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LogAnalyticsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -50,7 +50,7 @@ public virtual async Task<LogAnalyticsExportRequestRateByIntervalOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportRequestRateByInterval");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportRequestRateByInterval");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual LogAnalyticsExportRequestRateByIntervalOperation StartExportReque
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportRequestRateByInterval");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportRequestRateByInterval");
             scope.Start();
             try
             {
@@ -108,7 +108,7 @@ public virtual async Task<LogAnalyticsExportThrottledRequestsOperation> StartExp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportThrottledRequests");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportThrottledRequests");
             scope.Start();
             try
             {
@@ -137,7 +137,7 @@ public virtual LogAnalyticsExportThrottledRequestsOperation StartExportThrottled
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsClient.StartExportThrottledRequests");
+            using var scope = _clientDiagnostics.CreateScope("LogAnalyticsOperations.StartExportThrottledRequests");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsRestOperations.cs
index e78bda9aa28e0..d491bdf7f1445 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/LogAnalyticsRestOperations.cs
@@ -15,20 +15,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class LogAnalyticsRestClient
+    internal partial class LogAnalyticsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LogAnalyticsRestClient. </summary>
+        /// <summary> Initializes a new instance of LogAnalyticsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LogAnalyticsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LogAnalyticsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/OperationsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/Operations.cs
similarity index 81%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/OperationsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/Operations.cs
index 22981307b53ca..3dd5526d8f4ec 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/OperationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/Operations.cs
@@ -15,23 +15,23 @@
 
 namespace Azure.Management.Compute
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<ComputeOperationValue> ListAsync(CancellationToken
         {
             async Task<Page<ComputeOperationValue>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ public virtual Pageable<ComputeOperationValue> List(CancellationToken cancellati
         {
             Page<ComputeOperationValue> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsOperations.cs
similarity index 92%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsOperations.cs
index fe72f1dec9122..3fef447b7a234 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The ProximityPlacementGroups service client. </summary>
-    public partial class ProximityPlacementGroupsClient
+    public partial class ProximityPlacementGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ProximityPlacementGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ProximityPlacementGroupsClient for mocking. </summary>
-        protected ProximityPlacementGroupsClient()
+        internal ProximityPlacementGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ProximityPlacementGroupsOperations for mocking. </summary>
+        protected ProximityPlacementGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ProximityPlacementGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ProximityPlacementGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ProximityPlacementGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ProximityPlacementGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ProximityPlacementGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ProximityPlacementGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ProximityPlacementGroupsClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ProximityPlacementGroup>> CreateOrUpdateAsync(string resourceGroupName, string proximityPlacementGroupName, ProximityPlacementGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ProximityPlacementGroup>> CreateOrUpdateAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ProximityPlacementGroup> CreateOrUpdate(string resourceGroupName, string proximityPlacementGroupName, ProximityPlacementGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<ProximityPlacementGroup> CreateOrUpdate(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ProximityPlacementGroup>> UpdateAsync(string resourceGroupName, string proximityPlacementGroupName, UpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<ProximityPlacementGroup>> UpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ProximityPlacementGroup> Update(string resourceGroupName, string proximityPlacementGroupName, UpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<ProximityPlacementGroup> Update(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string proximityPlacementGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string proximityPlacementGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Delete");
             scope.Start();
             try
             {
@@ -162,7 +162,7 @@ public virtual Response Delete(string resourceGroupName, string proximityPlaceme
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ProximityPlacementGroup>> GetAsync(string resourceGroupName, string proximityPlacementGroupName, string includeColocationStatus = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -182,7 +182,7 @@ public virtual async Task<Response<ProximityPlacementGroup>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ProximityPlacementGroup> Get(string resourceGroupName, string proximityPlacementGroupName, string includeColocationStatus = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<ProximityPlacementGroup> ListBySubscriptionAsync(Ca
         {
             async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ProximityPlacementGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -238,7 +238,7 @@ public virtual Pageable<ProximityPlacementGroup> ListBySubscription(Cancellation
         {
             Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -253,7 +253,7 @@ Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ProximityPlacementGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -281,7 +281,7 @@ public virtual AsyncPageable<ProximityPlacementGroup> ListByResourceGroupAsync(s
 
             async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -296,7 +296,7 @@ async Task<Page<ProximityPlacementGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ProximityPlacementGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -324,7 +324,7 @@ public virtual Pageable<ProximityPlacementGroup> ListByResourceGroup(string reso
 
             Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -339,7 +339,7 @@ Page<ProximityPlacementGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ProximityPlacementGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ProximityPlacementGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsRestOperations.cs
index ee9e7f22c23fa..3a35c5e8d9c4c 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ProximityPlacementGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class ProximityPlacementGroupsRestClient
+    internal partial class ProximityPlacementGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ProximityPlacementGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ProximityPlacementGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ProximityPlacementGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ProximityPlacementGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusOperations.cs
similarity index 88%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusOperations.cs
index fb110bd3e7087..b8ac079d393d5 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The ResourceSkus service client. </summary>
-    public partial class ResourceSkusClient
+    public partial class ResourceSkusOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceSkusRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceSkusClient for mocking. </summary>
-        protected ResourceSkusClient()
+        internal ResourceSkusRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceSkusOperations for mocking. </summary>
+        protected ResourceSkusOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceSkusClient. </summary>
+        /// <summary> Initializes a new instance of ResourceSkusOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourceSkusClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourceSkusOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourceSkusRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourceSkusRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ public virtual AsyncPageable<ResourceSku> ListAsync(string filter = null, Cancel
         {
             async Task<Page<ResourceSku>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -59,7 +59,7 @@ async Task<Page<ResourceSku>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ResourceSku>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -82,7 +82,7 @@ public virtual Pageable<ResourceSku> List(string filter = null, CancellationToke
         {
             Page<ResourceSku> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -97,7 +97,7 @@ Page<ResourceSku> FirstPageFunc(int? pageSizeHint)
             }
             Page<ResourceSku> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceSkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceSkusOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusRestOperations.cs
index 3fc359ffde789..8ea734ea7a7f1 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/ResourceSkusRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class ResourceSkusRestClient
+    internal partial class ResourceSkusRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceSkusRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceSkusRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceSkusRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourceSkusRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/OperationsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/RestOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/OperationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/RestOperations.cs
index 52de69cd10c5c..ad70c019f7820 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/OperationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/RestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsOperations.cs
index 7794d2a881b6e..ef83b76204c69 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The Snapshots service client. </summary>
-    public partial class SnapshotsClient
+    public partial class SnapshotsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SnapshotsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SnapshotsClient for mocking. </summary>
-        protected SnapshotsClient()
+        internal SnapshotsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SnapshotsOperations for mocking. </summary>
+        protected SnapshotsOperations()
         {
         }
-        /// <summary> Initializes a new instance of SnapshotsClient. </summary>
+        /// <summary> Initializes a new instance of SnapshotsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SnapshotsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SnapshotsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SnapshotsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SnapshotsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal SnapshotsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Snapshot>> GetAsync(string resourceGroupName, string snapshotName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<Snapshot>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Snapshot> Get(string resourceGroupName, string snapshotName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<Snapshot> ListByResourceGroupAsync(string resourceG
 
             async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Snapshot>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<Snapshot> ListByResourceGroup(string resourceGroupName,
 
             Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             }
             Page<Snapshot> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<Snapshot> ListAsync(CancellationToken cancellationT
         {
             async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<Snapshot>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Snapshot>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<Snapshot> List(CancellationToken cancellationToken = def
         {
             Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<Snapshot> FirstPageFunc(int? pageSizeHint)
             }
             Page<Snapshot> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.List");
                 scope.Start();
                 try
                 {
@@ -255,7 +255,7 @@ public virtual async Task<SnapshotsCreateOrUpdateOperation> StartCreateOrUpdateA
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -289,7 +289,7 @@ public virtual SnapshotsCreateOrUpdateOperation StartCreateOrUpdate(string resou
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<SnapshotsUpdateOperation> StartUpdateAsync(string reso
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -357,7 +357,7 @@ public virtual SnapshotsUpdateOperation StartUpdate(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(snapshot));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -386,7 +386,7 @@ public virtual async Task<SnapshotsDeleteOperation> StartDeleteAsync(string reso
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual SnapshotsDeleteOperation StartDelete(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -449,7 +449,7 @@ public virtual async Task<SnapshotsGrantAccessOperation> StartGrantAccessAsync(s
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -483,7 +483,7 @@ public virtual SnapshotsGrantAccessOperation StartGrantAccess(string resourceGro
                 throw new ArgumentNullException(nameof(grantAccessData));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartGrantAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartGrantAccess");
             scope.Start();
             try
             {
@@ -512,7 +512,7 @@ public virtual async Task<SnapshotsRevokeAccessOperation> StartRevokeAccessAsync
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartRevokeAccess");
             scope.Start();
             try
             {
@@ -541,7 +541,7 @@ public virtual SnapshotsRevokeAccessOperation StartRevokeAccess(string resourceG
                 throw new ArgumentNullException(nameof(snapshotName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SnapshotsClient.StartRevokeAccess");
+            using var scope = _clientDiagnostics.CreateScope("SnapshotsOperations.StartRevokeAccess");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsRestOperations.cs
index 72c81516d66b5..932348428e779 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SnapshotsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class SnapshotsRestClient
+    internal partial class SnapshotsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SnapshotsRestClient. </summary>
+        /// <summary> Initializes a new instance of SnapshotsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SnapshotsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SnapshotsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysOperations.cs
index 5edf44747985a..31d65d8762455 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The SshPublicKeys service client. </summary>
-    public partial class SshPublicKeysClient
+    public partial class SshPublicKeysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SshPublicKeysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SshPublicKeysClient for mocking. </summary>
-        protected SshPublicKeysClient()
+        internal SshPublicKeysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SshPublicKeysOperations for mocking. </summary>
+        protected SshPublicKeysOperations()
         {
         }
-        /// <summary> Initializes a new instance of SshPublicKeysClient. </summary>
+        /// <summary> Initializes a new instance of SshPublicKeysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SshPublicKeysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SshPublicKeysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SshPublicKeysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SshPublicKeysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal SshPublicKeysClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyResource>> CreateAsync(string resourceGroupName, string sshPublicKeyName, SshPublicKeyResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Create");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<SshPublicKeyResource>> CreateAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyResource> Create(string resourceGroupName, string sshPublicKeyName, SshPublicKeyResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Create");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<SshPublicKeyResource> Create(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyResource>> UpdateAsync(string resourceGroupName, string sshPublicKeyName, SshPublicKeyUpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Update");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<SshPublicKeyResource>> UpdateAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyResource> Update(string resourceGroupName, string sshPublicKeyName, SshPublicKeyUpdateResource parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Update");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual Response<SshPublicKeyResource> Update(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Delete");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Delete");
             scope.Start();
             try
             {
@@ -161,7 +161,7 @@ public virtual Response Delete(string resourceGroupName, string sshPublicKeyName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyResource>> GetAsync(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Get");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<SshPublicKeyResource>> GetAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyResource> Get(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.Get");
             scope.Start();
             try
             {
@@ -199,7 +199,7 @@ public virtual Response<SshPublicKeyResource> Get(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SshPublicKeyGenerateKeyPairResult>> GenerateKeyPairAsync(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.GenerateKeyPair");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.GenerateKeyPair");
             scope.Start();
             try
             {
@@ -218,7 +218,7 @@ public virtual async Task<Response<SshPublicKeyGenerateKeyPairResult>> GenerateK
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SshPublicKeyGenerateKeyPairResult> GenerateKeyPair(string resourceGroupName, string sshPublicKeyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.GenerateKeyPair");
+            using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.GenerateKeyPair");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual AsyncPageable<SshPublicKeyResource> ListBySubscriptionAsync(Cance
         {
             async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SshPublicKeyResource>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -274,7 +274,7 @@ public virtual Pageable<SshPublicKeyResource> ListBySubscription(CancellationTok
         {
             Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -289,7 +289,7 @@ Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             }
             Page<SshPublicKeyResource> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -317,7 +317,7 @@ public virtual AsyncPageable<SshPublicKeyResource> ListByResourceGroupAsync(stri
 
             async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -332,7 +332,7 @@ async Task<Page<SshPublicKeyResource>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SshPublicKeyResource>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -360,7 +360,7 @@ public virtual Pageable<SshPublicKeyResource> ListByResourceGroup(string resourc
 
             Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -375,7 +375,7 @@ Page<SshPublicKeyResource> FirstPageFunc(int? pageSizeHint)
             }
             Page<SshPublicKeyResource> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SshPublicKeysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysRestOperations.cs
index edcead030a01b..e5020069aa49a 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/SshPublicKeysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class SshPublicKeysRestClient
+    internal partial class SshPublicKeysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SshPublicKeysRestClient. </summary>
+        /// <summary> Initializes a new instance of SshPublicKeysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SshPublicKeysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SshPublicKeysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageOperations.cs
similarity index 88%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageOperations.cs
index e7d4efb492d57..747096447db47 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The Usage service client. </summary>
-    public partial class UsageClient
+    public partial class UsageOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsageRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsageClient for mocking. </summary>
-        protected UsageClient()
+        internal UsageRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsageOperations for mocking. </summary>
+        protected UsageOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsageClient. </summary>
+        /// <summary> Initializes a new instance of UsageOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal UsageClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal UsageOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new UsageRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new UsageRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<Usage> ListAsync(string location, CancellationToken
 
             async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Usage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<Usage> List(string location, CancellationToken cancellat
 
             Page<Usage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<Usage> FirstPageFunc(int? pageSizeHint)
             }
             Page<Usage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsageClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsageOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageRestOperations.cs
index 92b8b3ab7836e..b8c27de557613 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/UsageRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class UsageRestClient
+    internal partial class UsageRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsageRestClient. </summary>
+        /// <summary> Initializes a new instance of UsageRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsageRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public UsageRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesOperations.cs
similarity index 89%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesOperations.cs
index 3caa5de6c6625..5ccb638d21ed4 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineExtensionImages service client. </summary>
-    public partial class VirtualMachineExtensionImagesClient
+    public partial class VirtualMachineExtensionImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineExtensionImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesClient for mocking. </summary>
-        protected VirtualMachineExtensionImagesClient()
+        internal VirtualMachineExtensionImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesOperations for mocking. </summary>
+        protected VirtualMachineExtensionImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineExtensionImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineExtensionImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineExtensionImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineExtensionImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VirtualMachineExtensionImagesClient(ClientDiagnostics clientDiagnostics
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtensionImage>> GetAsync(string location, string publisherName, string type, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<VirtualMachineExtensionImage>> GetAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtensionImage> Get(string location, string publisherName, string type, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<VirtualMachineExtensionImage> Get(string location, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>> ListTypesAsync(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListTypes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListTypes");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineExtensionImage>> ListTypes(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListTypes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListTypes");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<IReadOnlyList<VirtualMachineExtensionImage>> ListTypes(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>> ListVersionsAsync(string location, string publisherName, string type, string filter = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListVersions");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListVersions");
             scope.Start();
             try
             {
@@ -150,7 +150,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineExtensionImage>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineExtensionImage>> ListVersions(string location, string publisherName, string type, string filter = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesClient.ListVersions");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionImagesOperations.ListVersions");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesRestOperations.cs
index 6d395ec5b2adf..9d9d0117876f0 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionImagesRestOperations.cs
@@ -17,20 +17,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineExtensionImagesRestClient
+    internal partial class VirtualMachineExtensionImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineExtensionImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineExtensionImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsOperations.cs
index f0bc998ae61fb..a7df0959d0cdb 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineExtensions service client. </summary>
-    public partial class VirtualMachineExtensionsClient
+    public partial class VirtualMachineExtensionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineExtensionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionsClient for mocking. </summary>
-        protected VirtualMachineExtensionsClient()
+        internal VirtualMachineExtensionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineExtensionsOperations for mocking. </summary>
+        protected VirtualMachineExtensionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineExtensionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineExtensionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineExtensionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineExtensionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineExtensionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualMachineExtensionsClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -105,7 +105,7 @@ public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -143,7 +143,7 @@ public virtual async Task<VirtualMachineExtensionsCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -182,7 +182,7 @@ public virtual VirtualMachineExtensionsCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -221,7 +221,7 @@ public virtual async Task<VirtualMachineExtensionsUpdateOperation> StartUpdateAs
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -260,7 +260,7 @@ public virtual VirtualMachineExtensionsUpdateOperation StartUpdate(string resour
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -294,7 +294,7 @@ public virtual async Task<VirtualMachineExtensionsDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -328,7 +328,7 @@ public virtual VirtualMachineExtensionsDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsRestOperations.cs
index cf9993c003de3..839ae946018ad 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineExtensionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineExtensionsRestClient
+    internal partial class VirtualMachineExtensionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineExtensionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineExtensionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineExtensionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineExtensionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesOperations.cs
similarity index 92%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesOperations.cs
index 473823c2280ad..b2dbbf3a36e82 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineImages service client. </summary>
-    public partial class VirtualMachineImagesClient
+    public partial class VirtualMachineImagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineImagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineImagesClient for mocking. </summary>
-        protected VirtualMachineImagesClient()
+        internal VirtualMachineImagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineImagesOperations for mocking. </summary>
+        protected VirtualMachineImagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineImagesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineImagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineImagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineImagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineImagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineImagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal VirtualMachineImagesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineImage>> GetAsync(string location, string publisherName, string offer, string skus, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.Get");
             scope.Start();
             try
             {
@@ -68,7 +68,7 @@ public virtual async Task<Response<VirtualMachineImage>> GetAsync(string locatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineImage> Get(string location, string publisherName, string offer, string skus, string version, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.Get");
             scope.Start();
             try
             {
@@ -92,7 +92,7 @@ public virtual Response<VirtualMachineImage> Get(string location, string publish
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListAsync(string location, string publisherName, string offer, string skus, string expand = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.List");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> List(string location, string publisherName, string offer, string skus, string expand = null, int? top = null, string orderby = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.List");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual Response<IReadOnlyList<VirtualMachineImageResource>> List(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListOffersAsync(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListOffers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListOffers");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListOffers(string location, string publisherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListOffers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListOffers");
             scope.Start();
             try
             {
@@ -172,7 +172,7 @@ public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListOffers(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListPublishersAsync(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListPublishers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListPublishers");
             scope.Start();
             try
             {
@@ -190,7 +190,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListPublishers(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListPublishers");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListPublishers");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListPublishe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>> ListSkusAsync(string location, string publisherName, string offer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListSkus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListSkus");
             scope.Start();
             try
             {
@@ -230,7 +230,7 @@ public virtual async Task<Response<IReadOnlyList<VirtualMachineImageResource>>>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<VirtualMachineImageResource>> ListSkus(string location, string publisherName, string offer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesClient.ListSkus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineImagesOperations.ListSkus");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesRestOperations.cs
index ac0497ef99a74..50ce8e17fa6e1 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineImagesRestOperations.cs
@@ -17,20 +17,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineImagesRestClient
+    internal partial class VirtualMachineImagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineImagesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineImagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineImagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineImagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsOperations.cs
similarity index 89%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsOperations.cs
index 9c5a1a81a077a..2e16b312040ad 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineRunCommands service client. </summary>
-    public partial class VirtualMachineRunCommandsClient
+    public partial class VirtualMachineRunCommandsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineRunCommandsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineRunCommandsClient for mocking. </summary>
-        protected VirtualMachineRunCommandsClient()
+        internal VirtualMachineRunCommandsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineRunCommandsOperations for mocking. </summary>
+        protected VirtualMachineRunCommandsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineRunCommandsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineRunCommandsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineRunCommandsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineRunCommandsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineRunCommandsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineRunCommandsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualMachineRunCommandsClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RunCommandDocument>> GetAsync(string location, string commandId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<RunCommandDocument>> GetAsync(string location
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RunCommandDocument> Get(string location, string commandId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<RunCommandDocumentBase> ListAsync(string location,
 
             async Task<Page<RunCommandDocumentBase>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<RunCommandDocumentBase>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RunCommandDocumentBase>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<RunCommandDocumentBase> List(string location, Cancellati
 
             Page<RunCommandDocumentBase> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<RunCommandDocumentBase> FirstPageFunc(int? pageSizeHint)
             }
             Page<RunCommandDocumentBase> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineRunCommandsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsRestOperations.cs
index 3fe141a84a716..cf543f0d29664 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineRunCommandsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineRunCommandsRestClient
+    internal partial class VirtualMachineRunCommandsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineRunCommandsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineRunCommandsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineRunCommandsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineRunCommandsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsOperations.cs
index f6c12c018f952..a81a89b16aac8 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineScaleSetExtensions service client. </summary>
-    public partial class VirtualMachineScaleSetExtensionsClient
+    public partial class VirtualMachineScaleSetExtensionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetExtensionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsClient for mocking. </summary>
-        protected VirtualMachineScaleSetExtensionsClient()
+        internal VirtualMachineScaleSetExtensionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetExtensionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetExtensionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetExtensionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetExtensionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetExtensionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VirtualMachineScaleSetExtensionsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<VirtualMachineScaleSetExtension>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetExtension> Get(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<VirtualMachineScaleSetExtension> ListAsync(string r
 
             async Task<Page<VirtualMachineScaleSetExtension>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<VirtualMachineScaleSetExtension>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<VirtualMachineScaleSetExtension>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ public virtual Pageable<VirtualMachineScaleSetExtension> List(string resourceGro
 
             Page<VirtualMachineScaleSetExtension> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -159,7 +159,7 @@ Page<VirtualMachineScaleSetExtension> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSetExtension> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -200,7 +200,7 @@ public virtual async Task<VirtualMachineScaleSetExtensionsCreateOrUpdateOperatio
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -239,7 +239,7 @@ public virtual VirtualMachineScaleSetExtensionsCreateOrUpdateOperation StartCrea
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -278,7 +278,7 @@ public virtual async Task<VirtualMachineScaleSetExtensionsUpdateOperation> Start
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual VirtualMachineScaleSetExtensionsUpdateOperation StartUpdate(strin
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -351,7 +351,7 @@ public virtual async Task<VirtualMachineScaleSetExtensionsDeleteOperation> Start
                 throw new ArgumentNullException(nameof(vmssExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual VirtualMachineScaleSetExtensionsDeleteOperation StartDelete(strin
                 throw new ArgumentNullException(nameof(vmssExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsRestOperations.cs
index a6e6b43c7c7ac..16498c989e664 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetExtensionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineScaleSetExtensionsRestClient
+    internal partial class VirtualMachineScaleSetExtensionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetExtensionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetExtensionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetExtensionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesOperations.cs
index c75db1219a8fe..4d2d1cb8b3ab3 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineScaleSetRollingUpgrades service client. </summary>
-    public partial class VirtualMachineScaleSetRollingUpgradesClient
+    public partial class VirtualMachineScaleSetRollingUpgradesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetRollingUpgradesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesClient for mocking. </summary>
-        protected VirtualMachineScaleSetRollingUpgradesClient()
+        internal VirtualMachineScaleSetRollingUpgradesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesOperations for mocking. </summary>
+        protected VirtualMachineScaleSetRollingUpgradesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetRollingUpgradesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetRollingUpgradesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetRollingUpgradesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetRollingUpgradesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal VirtualMachineScaleSetRollingUpgradesClient(ClientDiagnostics clientDia
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RollingUpgradeStatusInfo>> GetLatestAsync(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.GetLatest");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.GetLatest");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<RollingUpgradeStatusInfo>> GetLatestAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RollingUpgradeStatusInfo> GetLatest(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.GetLatest");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.GetLatest");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual async Task<VirtualMachineScaleSetRollingUpgradesCancelOperation>
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartCancel");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartCancel");
             scope.Start();
             try
             {
@@ -118,7 +118,7 @@ public virtual VirtualMachineScaleSetRollingUpgradesCancelOperation StartCancel(
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartCancel");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartCancel");
             scope.Start();
             try
             {
@@ -147,7 +147,7 @@ public virtual async Task<VirtualMachineScaleSetRollingUpgradesStartOSUpgradeOpe
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartOSUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartOSUpgrade");
             scope.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual VirtualMachineScaleSetRollingUpgradesStartOSUpgradeOperation Star
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartOSUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartOSUpgrade");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual async Task<VirtualMachineScaleSetRollingUpgradesStartExtensionUpg
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartExtensionUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartExtensionUpgrade");
             scope.Start();
             try
             {
@@ -234,7 +234,7 @@ public virtual VirtualMachineScaleSetRollingUpgradesStartExtensionUpgradeOperati
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesClient.StartStartExtensionUpgrade");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetRollingUpgradesOperations.StartStartExtensionUpgrade");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesRestOperations.cs
index 96cc76d90513a..44f21b9ca83d0 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetRollingUpgradesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineScaleSetRollingUpgradesRestClient
+    internal partial class VirtualMachineScaleSetRollingUpgradesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetRollingUpgradesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetRollingUpgradesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetRollingUpgradesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsOperations.cs
index 24f1c8ebc70ac..927743b5d2977 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineScaleSetVMExtensions service client. </summary>
-    public partial class VirtualMachineScaleSetVMExtensionsClient
+    public partial class VirtualMachineScaleSetVMExtensionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetVMExtensionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsClient for mocking. </summary>
-        protected VirtualMachineScaleSetVMExtensionsClient()
+        internal VirtualMachineScaleSetVMExtensionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetVMExtensionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetVMExtensionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetVMExtensionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetVMExtensionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetVMExtensionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal VirtualMachineScaleSetVMExtensionsClient(ClientDiagnostics clientDiagno
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<VirtualMachineExtension>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.Get");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<VirtualMachineExtension> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<VirtualMachineExtensionsListResult>> ListAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmScaleSetName, string instanceId, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.List");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual async Task<VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperat
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -196,7 +196,7 @@ public virtual VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation StartCr
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -240,7 +240,7 @@ public virtual async Task<VirtualMachineScaleSetVMExtensionsUpdateOperation> Sta
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -284,7 +284,7 @@ public virtual VirtualMachineScaleSetVMExtensionsUpdateOperation StartUpdate(str
                 throw new ArgumentNullException(nameof(extensionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -323,7 +323,7 @@ public virtual async Task<VirtualMachineScaleSetVMExtensionsDeleteOperation> Sta
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -362,7 +362,7 @@ public virtual VirtualMachineScaleSetVMExtensionsDeleteOperation StartDelete(str
                 throw new ArgumentNullException(nameof(vmExtensionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMExtensionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsRestOperations.cs
index f3fe4c1466d3b..a71be5a914de9 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMExtensionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineScaleSetVMExtensionsRestClient
+    internal partial class VirtualMachineScaleSetVMExtensionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMExtensionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetVMExtensionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetVMExtensionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsOperations.cs
index 6066cd22188a8..4a8a35df6d258 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineScaleSetVMs service client. </summary>
-    public partial class VirtualMachineScaleSetVMsClient
+    public partial class VirtualMachineScaleSetVMsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetVMsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsClient for mocking. </summary>
-        protected VirtualMachineScaleSetVMsClient()
+        internal VirtualMachineScaleSetVMsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetVMsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetVMsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetVMsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetVMsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetVMsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualMachineScaleSetVMsClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetVM>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualMachineScaleSetVM>> GetAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetVM> Get(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<VirtualMachineScaleSetVM> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetVMInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<VirtualMachineScaleSetVMInstanceView>> GetIns
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetVMInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -124,7 +124,7 @@ public virtual Response<VirtualMachineScaleSetVMInstanceView> GetInstanceView(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -144,7 +144,7 @@ public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response SimulateEviction(string resourceGroupName, string vmScaleSetName, string instanceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -177,7 +177,7 @@ public virtual AsyncPageable<VirtualMachineScaleSetVM> ListAsync(string resource
 
             async Task<Page<VirtualMachineScaleSetVM>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -192,7 +192,7 @@ async Task<Page<VirtualMachineScaleSetVM>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSetVM>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -228,7 +228,7 @@ public virtual Pageable<VirtualMachineScaleSetVM> List(string resourceGroupName,
 
             Page<VirtualMachineScaleSetVM> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -243,7 +243,7 @@ Page<VirtualMachineScaleSetVM> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSetVM> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.List");
                 scope.Start();
                 try
                 {
@@ -280,7 +280,7 @@ public virtual async Task<VirtualMachineScaleSetVMsReimageOperation> StartReimag
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual VirtualMachineScaleSetVMsReimageOperation StartReimage(string res
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual async Task<VirtualMachineScaleSetVMsReimageAllOperation> StartRei
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -383,7 +383,7 @@ public virtual VirtualMachineScaleSetVMsReimageAllOperation StartReimageAll(stri
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -417,7 +417,7 @@ public virtual async Task<VirtualMachineScaleSetVMsDeallocateOperation> StartDea
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -451,7 +451,7 @@ public virtual VirtualMachineScaleSetVMsDeallocateOperation StartDeallocate(stri
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -490,7 +490,7 @@ public virtual async Task<VirtualMachineScaleSetVMsUpdateOperation> StartUpdateA
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -529,7 +529,7 @@ public virtual VirtualMachineScaleSetVMsUpdateOperation StartUpdate(string resou
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -563,7 +563,7 @@ public virtual async Task<VirtualMachineScaleSetVMsDeleteOperation> StartDeleteA
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -597,7 +597,7 @@ public virtual VirtualMachineScaleSetVMsDeleteOperation StartDelete(string resou
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -632,7 +632,7 @@ public virtual async Task<VirtualMachineScaleSetVMsPowerOffOperation> StartPower
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual VirtualMachineScaleSetVMsPowerOffOperation StartPowerOff(string r
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -701,7 +701,7 @@ public virtual async Task<VirtualMachineScaleSetVMsRestartOperation> StartRestar
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -735,7 +735,7 @@ public virtual VirtualMachineScaleSetVMsRestartOperation StartRestart(string res
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -769,7 +769,7 @@ public virtual async Task<VirtualMachineScaleSetVMsStartOperation> StartStartAsy
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartStart");
             scope.Start();
             try
             {
@@ -803,7 +803,7 @@ public virtual VirtualMachineScaleSetVMsStartOperation StartStart(string resourc
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartStart");
             scope.Start();
             try
             {
@@ -837,7 +837,7 @@ public virtual async Task<VirtualMachineScaleSetVMsRedeployOperation> StartRedep
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -871,7 +871,7 @@ public virtual VirtualMachineScaleSetVMsRedeployOperation StartRedeploy(string r
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -905,7 +905,7 @@ public virtual async Task<VirtualMachineScaleSetVMsPerformMaintenanceOperation>
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -939,7 +939,7 @@ public virtual VirtualMachineScaleSetVMsPerformMaintenanceOperation StartPerform
                 throw new ArgumentNullException(nameof(instanceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -978,7 +978,7 @@ public virtual async Task<VirtualMachineScaleSetVMsRunCommandOperation> StartRun
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRunCommand");
             scope.Start();
             try
             {
@@ -1017,7 +1017,7 @@ public virtual VirtualMachineScaleSetVMsRunCommandOperation StartRunCommand(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetVMsOperations.StartRunCommand");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsRestOperations.cs
index c2e9a230014dd..6fbbeed4549b2 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetVMsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineScaleSetVMsRestClient
+    internal partial class VirtualMachineScaleSetVMsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetVMsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetVMsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetVMsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsOperations.cs
index 988a25584e876..3d8d87af77dce 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineScaleSets service client. </summary>
-    public partial class VirtualMachineScaleSetsClient
+    public partial class VirtualMachineScaleSetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineScaleSetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetsClient for mocking. </summary>
-        protected VirtualMachineScaleSetsClient()
+        internal VirtualMachineScaleSetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetsOperations for mocking. </summary>
+        protected VirtualMachineScaleSetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineScaleSetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineScaleSetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineScaleSetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineScaleSetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualMachineScaleSetsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSet>> GetAsync(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualMachineScaleSet>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSet> Get(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualMachineScaleSet> Get(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineScaleSetInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<VirtualMachineScaleSetInstanceView>> GetInsta
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineScaleSetInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetInstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetInstanceView");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<VirtualMachineScaleSetInstanceView> GetInstanceView(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RecoveryWalkResponse>> ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<RecoveryWalkResponse>> ForceRecoveryServiceFa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RecoveryWalkResponse> ForceRecoveryServiceFabricPlatformUpdateDomainWalk(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ForceRecoveryServiceFabricPlatformUpdateDomainWalk");
             scope.Start();
             try
             {
@@ -160,7 +160,7 @@ public virtual Response<RecoveryWalkResponse> ForceRecoveryServiceFabricPlatform
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> ConvertToSinglePlacementGroupAsync(string resourceGroupName, string vmScaleSetName, VMScaleSetConvertToSinglePlacementGroupInput parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ConvertToSinglePlacementGroup");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ConvertToSinglePlacementGroup");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response> ConvertToSinglePlacementGroupAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response ConvertToSinglePlacementGroup(string resourceGroupName, string vmScaleSetName, VMScaleSetConvertToSinglePlacementGroupInput parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ConvertToSinglePlacementGroup");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ConvertToSinglePlacementGroup");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual AsyncPageable<VirtualMachineScaleSet> ListAsync(string resourceGr
 
             async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -220,7 +220,7 @@ async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual Pageable<VirtualMachineScaleSet> List(string resourceGroupName, C
 
             Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -285,7 +285,7 @@ public virtual AsyncPageable<VirtualMachineScaleSet> ListAllAsync(CancellationTo
         {
             async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -300,7 +300,7 @@ async Task<Page<VirtualMachineScaleSet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -322,7 +322,7 @@ public virtual Pageable<VirtualMachineScaleSet> ListAll(CancellationToken cancel
         {
             Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -337,7 +337,7 @@ Page<VirtualMachineScaleSet> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -370,7 +370,7 @@ public virtual AsyncPageable<VirtualMachineScaleSetSku> ListSkusAsync(string res
 
             async Task<Page<VirtualMachineScaleSetSku>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -385,7 +385,7 @@ async Task<Page<VirtualMachineScaleSetSku>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachineScaleSetSku>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -418,7 +418,7 @@ public virtual Pageable<VirtualMachineScaleSetSku> ListSkus(string resourceGroup
 
             Page<VirtualMachineScaleSetSku> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -433,7 +433,7 @@ Page<VirtualMachineScaleSetSku> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachineScaleSetSku> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.ListSkus");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.ListSkus");
                 scope.Start();
                 try
                 {
@@ -466,7 +466,7 @@ public virtual AsyncPageable<UpgradeOperationHistoricalStatusInfo> GetOSUpgradeH
 
             async Task<Page<UpgradeOperationHistoricalStatusInfo>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -481,7 +481,7 @@ async Task<Page<UpgradeOperationHistoricalStatusInfo>> FirstPageFunc(int? pageSi
             }
             async Task<Page<UpgradeOperationHistoricalStatusInfo>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -514,7 +514,7 @@ public virtual Pageable<UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistor
 
             Page<UpgradeOperationHistoricalStatusInfo> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -529,7 +529,7 @@ Page<UpgradeOperationHistoricalStatusInfo> FirstPageFunc(int? pageSizeHint)
             }
             Page<UpgradeOperationHistoricalStatusInfo> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.GetOSUpgradeHistory");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.GetOSUpgradeHistory");
                 scope.Start();
                 try
                 {
@@ -565,7 +565,7 @@ public virtual async Task<VirtualMachineScaleSetsCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -599,7 +599,7 @@ public virtual VirtualMachineScaleSetsCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -633,7 +633,7 @@ public virtual async Task<VirtualMachineScaleSetsUpdateOperation> StartUpdateAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual VirtualMachineScaleSetsUpdateOperation StartUpdate(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -696,7 +696,7 @@ public virtual async Task<VirtualMachineScaleSetsDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -725,7 +725,7 @@ public virtual VirtualMachineScaleSetsDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -755,7 +755,7 @@ public virtual async Task<VirtualMachineScaleSetsDeallocateOperation> StartDeall
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -785,7 +785,7 @@ public virtual VirtualMachineScaleSetsDeallocateOperation StartDeallocate(string
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -819,7 +819,7 @@ public virtual async Task<VirtualMachineScaleSetsDeleteInstancesOperation> Start
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeleteInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeleteInstances");
             scope.Start();
             try
             {
@@ -853,7 +853,7 @@ public virtual VirtualMachineScaleSetsDeleteInstancesOperation StartDeleteInstan
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartDeleteInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartDeleteInstances");
             scope.Start();
             try
             {
@@ -884,7 +884,7 @@ public virtual async Task<VirtualMachineScaleSetsPowerOffOperation> StartPowerOf
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -915,7 +915,7 @@ public virtual VirtualMachineScaleSetsPowerOffOperation StartPowerOff(string res
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -945,7 +945,7 @@ public virtual async Task<VirtualMachineScaleSetsRestartOperation> StartRestartA
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -975,7 +975,7 @@ public virtual VirtualMachineScaleSetsRestartOperation StartRestart(string resou
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRestart");
             scope.Start();
             try
             {
@@ -1005,7 +1005,7 @@ public virtual async Task<VirtualMachineScaleSetsStartOperation> StartStartAsync
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartStart");
             scope.Start();
             try
             {
@@ -1035,7 +1035,7 @@ public virtual VirtualMachineScaleSetsStartOperation StartStart(string resourceG
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartStart");
             scope.Start();
             try
             {
@@ -1065,7 +1065,7 @@ public virtual async Task<VirtualMachineScaleSetsRedeployOperation> StartRedeplo
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1095,7 +1095,7 @@ public virtual VirtualMachineScaleSetsRedeployOperation StartRedeploy(string res
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1125,7 +1125,7 @@ public virtual async Task<VirtualMachineScaleSetsPerformMaintenanceOperation> St
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1155,7 +1155,7 @@ public virtual VirtualMachineScaleSetsPerformMaintenanceOperation StartPerformMa
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1189,7 +1189,7 @@ public virtual async Task<VirtualMachineScaleSetsUpdateInstancesOperation> Start
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdateInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdateInstances");
             scope.Start();
             try
             {
@@ -1223,7 +1223,7 @@ public virtual VirtualMachineScaleSetsUpdateInstancesOperation StartUpdateInstan
                 throw new ArgumentNullException(nameof(vmInstanceIDs));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartUpdateInstances");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartUpdateInstances");
             scope.Start();
             try
             {
@@ -1253,7 +1253,7 @@ public virtual async Task<VirtualMachineScaleSetsReimageOperation> StartReimageA
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1283,7 +1283,7 @@ public virtual VirtualMachineScaleSetsReimageOperation StartReimage(string resou
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1313,7 +1313,7 @@ public virtual async Task<VirtualMachineScaleSetsReimageAllOperation> StartReima
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -1343,7 +1343,7 @@ public virtual VirtualMachineScaleSetsReimageAllOperation StartReimageAll(string
                 throw new ArgumentNullException(nameof(vmScaleSetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartReimageAll");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartReimageAll");
             scope.Start();
             try
             {
@@ -1377,7 +1377,7 @@ public virtual async Task<VirtualMachineScaleSetsSetOrchestrationServiceStateOpe
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartSetOrchestrationServiceState");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartSetOrchestrationServiceState");
             scope.Start();
             try
             {
@@ -1411,7 +1411,7 @@ public virtual VirtualMachineScaleSetsSetOrchestrationServiceStateOperation Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsClient.StartSetOrchestrationServiceState");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachineScaleSetsOperations.StartSetOrchestrationServiceState");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsRestOperations.cs
index edae4eba8f2e2..6a804a5afa913 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineScaleSetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineScaleSetsRestClient
+    internal partial class VirtualMachineScaleSetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineScaleSetsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineScaleSetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineScaleSetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineScaleSetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesOperations.cs
similarity index 86%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesOperations.cs
index 5c9985931c6af..bacf734dfdc84 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachineSizes service client. </summary>
-    public partial class VirtualMachineSizesClient
+    public partial class VirtualMachineSizesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachineSizesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachineSizesClient for mocking. </summary>
-        protected VirtualMachineSizesClient()
+        internal VirtualMachineSizesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachineSizesOperations for mocking. </summary>
+        protected VirtualMachineSizesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachineSizesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineSizesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachineSizesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachineSizesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachineSizesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachineSizesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<VirtualMachineSize> ListAsync(string location, Canc
 
             async Task<Page<VirtualMachineSize>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesOperations.List");
                 scope.Start();
                 try
                 {
@@ -77,7 +77,7 @@ public virtual Pageable<VirtualMachineSize> List(string location, CancellationTo
 
             Page<VirtualMachineSize> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachineSizesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesRestOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesRestOperations.cs
index 5b4f086b78855..f7764311cb36d 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachineSizesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachineSizesRestClient
+    internal partial class VirtualMachineSizesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachineSizesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachineSizesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachineSizesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachineSizesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesOperations.cs
index 836ea9736be2b..02572d8786271 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Compute
 {
     /// <summary> The VirtualMachines service client. </summary>
-    public partial class VirtualMachinesClient
+    public partial class VirtualMachinesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualMachinesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualMachinesClient for mocking. </summary>
-        protected VirtualMachinesClient()
+        internal VirtualMachinesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualMachinesOperations for mocking. </summary>
+        protected VirtualMachinesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualMachinesClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachinesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualMachinesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualMachinesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualMachinesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualMachinesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualMachinesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachine>> GetAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualMachine>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachine> Get(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualMachine> Get(string resourceGroupName, string vmN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualMachineInstanceView>> InstanceViewAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.InstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.InstanceView");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<VirtualMachineInstanceView>> InstanceViewAsyn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualMachineInstanceView> InstanceView(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.InstanceView");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.InstanceView");
             scope.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response<VirtualMachineInstanceView> InstanceView(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> GeneralizeAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Generalize");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Generalize");
             scope.Start();
             try
             {
@@ -138,7 +138,7 @@ public virtual async Task<Response> GeneralizeAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Generalize(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.Generalize");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.Generalize");
             scope.Start();
             try
             {
@@ -157,7 +157,7 @@ public virtual Response Generalize(string resourceGroupName, string vmName, Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -176,7 +176,7 @@ public virtual async Task<Response> SimulateEvictionAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response SimulateEviction(string resourceGroupName, string vmName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.SimulateEviction");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.SimulateEviction");
             scope.Start();
             try
             {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<VirtualMachine> ListByLocationAsync(string location
 
             async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachine>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualMachine> ListByLocation(string location, Cancella
 
             Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachine> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -287,7 +287,7 @@ public virtual AsyncPageable<VirtualMachine> ListAsync(string resourceGroupName,
 
             async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -302,7 +302,7 @@ async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachine>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -330,7 +330,7 @@ public virtual Pageable<VirtualMachine> List(string resourceGroupName, Cancellat
 
             Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -345,7 +345,7 @@ Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachine> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.List");
                 scope.Start();
                 try
                 {
@@ -368,7 +368,7 @@ public virtual AsyncPageable<VirtualMachine> ListAllAsync(string statusOnly = nu
         {
             async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -383,7 +383,7 @@ async Task<Page<VirtualMachine>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualMachine>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -406,7 +406,7 @@ public virtual Pageable<VirtualMachine> ListAll(string statusOnly = null, Cancel
         {
             Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -421,7 +421,7 @@ Page<VirtualMachine> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualMachine> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -454,7 +454,7 @@ public virtual AsyncPageable<VirtualMachineSize> ListAvailableSizesAsync(string
 
             async Task<Page<VirtualMachineSize>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
@@ -487,7 +487,7 @@ public virtual Pageable<VirtualMachineSize> ListAvailableSizes(string resourceGr
 
             Page<VirtualMachineSize> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.ListAvailableSizes");
+                using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.ListAvailableSizes");
                 scope.Start();
                 try
                 {
@@ -523,7 +523,7 @@ public virtual async Task<VirtualMachinesCaptureOperation> StartCaptureAsync(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCapture");
             scope.Start();
             try
             {
@@ -557,7 +557,7 @@ public virtual VirtualMachinesCaptureOperation StartCapture(string resourceGroup
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCapture");
             scope.Start();
             try
             {
@@ -591,7 +591,7 @@ public virtual async Task<VirtualMachinesCreateOrUpdateOperation> StartCreateOrU
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -625,7 +625,7 @@ public virtual VirtualMachinesCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -659,7 +659,7 @@ public virtual async Task<VirtualMachinesUpdateOperation> StartUpdateAsync(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -693,7 +693,7 @@ public virtual VirtualMachinesUpdateOperation StartUpdate(string resourceGroupNa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -722,7 +722,7 @@ public virtual async Task<VirtualMachinesDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -751,7 +751,7 @@ public virtual VirtualMachinesDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -780,7 +780,7 @@ public virtual async Task<VirtualMachinesConvertToManagedDisksOperation> StartCo
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartConvertToManagedDisks");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartConvertToManagedDisks");
             scope.Start();
             try
             {
@@ -809,7 +809,7 @@ public virtual VirtualMachinesConvertToManagedDisksOperation StartConvertToManag
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartConvertToManagedDisks");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartConvertToManagedDisks");
             scope.Start();
             try
             {
@@ -838,7 +838,7 @@ public virtual async Task<VirtualMachinesDeallocateOperation> StartDeallocateAsy
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -867,7 +867,7 @@ public virtual VirtualMachinesDeallocateOperation StartDeallocate(string resourc
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartDeallocate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartDeallocate");
             scope.Start();
             try
             {
@@ -897,7 +897,7 @@ public virtual async Task<VirtualMachinesPowerOffOperation> StartPowerOffAsync(s
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -927,7 +927,7 @@ public virtual VirtualMachinesPowerOffOperation StartPowerOff(string resourceGro
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPowerOff");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPowerOff");
             scope.Start();
             try
             {
@@ -956,7 +956,7 @@ public virtual async Task<VirtualMachinesReapplyOperation> StartReapplyAsync(str
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReapply");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReapply");
             scope.Start();
             try
             {
@@ -985,7 +985,7 @@ public virtual VirtualMachinesReapplyOperation StartReapply(string resourceGroup
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReapply");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReapply");
             scope.Start();
             try
             {
@@ -1014,7 +1014,7 @@ public virtual async Task<VirtualMachinesRestartOperation> StartRestartAsync(str
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRestart");
             scope.Start();
             try
             {
@@ -1043,7 +1043,7 @@ public virtual VirtualMachinesRestartOperation StartRestart(string resourceGroup
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRestart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRestart");
             scope.Start();
             try
             {
@@ -1072,7 +1072,7 @@ public virtual async Task<VirtualMachinesStartOperation> StartStartAsync(string
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartStart");
             scope.Start();
             try
             {
@@ -1101,7 +1101,7 @@ public virtual VirtualMachinesStartOperation StartStart(string resourceGroupName
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartStart");
             scope.Start();
             try
             {
@@ -1130,7 +1130,7 @@ public virtual async Task<VirtualMachinesRedeployOperation> StartRedeployAsync(s
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1159,7 +1159,7 @@ public virtual VirtualMachinesRedeployOperation StartRedeploy(string resourceGro
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRedeploy");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRedeploy");
             scope.Start();
             try
             {
@@ -1189,7 +1189,7 @@ public virtual async Task<VirtualMachinesReimageOperation> StartReimageAsync(str
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1219,7 +1219,7 @@ public virtual VirtualMachinesReimageOperation StartReimage(string resourceGroup
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartReimage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartReimage");
             scope.Start();
             try
             {
@@ -1248,7 +1248,7 @@ public virtual async Task<VirtualMachinesPerformMaintenanceOperation> StartPerfo
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1277,7 +1277,7 @@ public virtual VirtualMachinesPerformMaintenanceOperation StartPerformMaintenanc
                 throw new ArgumentNullException(nameof(vmName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartPerformMaintenance");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartPerformMaintenance");
             scope.Start();
             try
             {
@@ -1311,7 +1311,7 @@ public virtual async Task<VirtualMachinesRunCommandOperation> StartRunCommandAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRunCommand");
             scope.Start();
             try
             {
@@ -1345,7 +1345,7 @@ public virtual VirtualMachinesRunCommandOperation StartRunCommand(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesClient.StartRunCommand");
+            using var scope = _clientDiagnostics.CreateScope("VirtualMachinesOperations.StartRunCommand");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesRestClient.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesRestClient.cs
rename to sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesRestOperations.cs
index b8c43309f76ec..28dae7b96d2f6 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/src/Generated/VirtualMachinesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Compute
 {
-    internal partial class VirtualMachinesRestClient
+    internal partial class VirtualMachinesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualMachinesRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualMachinesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> Subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualMachinesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualMachinesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysOperations.cs
index d39add5c23052..cfb8c6a395b71 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysOperations.cs
@@ -17,23 +17,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ApplicationGateways service client. </summary>
-    public partial class ApplicationGatewaysClient
+    public partial class ApplicationGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationGatewaysClient for mocking. </summary>
-        protected ApplicationGatewaysClient()
+        internal ApplicationGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationGatewaysOperations for mocking. </summary>
+        protected ApplicationGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ApplicationGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ApplicationGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ApplicationGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ApplicationGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ApplicationGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGateway>> GetAsync(string resourceGroupName, string applicationGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ApplicationGateway>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGateway> Get(string resourceGroupName, string applicationGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<ApplicationGateway> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGateway>> UpdateTagsAsync(string resourceGroupName, string applicationGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -103,7 +103,7 @@ public virtual async Task<Response<ApplicationGateway>> UpdateTagsAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGateway> UpdateTags(string resourceGroupName, string applicationGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<ApplicationGateway> UpdateTags(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableServerVariablesAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableServerVariables");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableServerVariables");
             scope.Start();
             try
             {
@@ -137,7 +137,7 @@ public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableServerVa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<string>> ListAvailableServerVariables(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableServerVariables");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableServerVariables");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual Response<IReadOnlyList<string>> ListAvailableServerVariables(Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableRequestHeadersAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableRequestHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableRequestHeaders");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableRequestH
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<string>> ListAvailableRequestHeaders(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableRequestHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableRequestHeaders");
             scope.Start();
             try
             {
@@ -188,7 +188,7 @@ public virtual Response<IReadOnlyList<string>> ListAvailableRequestHeaders(Cance
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableResponseHeadersAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableResponseHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableResponseHeaders");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual async Task<Response<IReadOnlyList<string>>> ListAvailableResponse
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IReadOnlyList<string>> ListAvailableResponseHeaders(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableResponseHeaders");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableResponseHeaders");
             scope.Start();
             try
             {
@@ -222,7 +222,7 @@ public virtual Response<IReadOnlyList<string>> ListAvailableResponseHeaders(Canc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGatewayAvailableWafRuleSetsResult>> ListAvailableWafRuleSetsAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableWafRuleSets");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableWafRuleSets");
             scope.Start();
             try
             {
@@ -239,7 +239,7 @@ public virtual async Task<Response<ApplicationGatewayAvailableWafRuleSetsResult>
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGatewayAvailableWafRuleSetsResult> ListAvailableWafRuleSets(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableWafRuleSets");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableWafRuleSets");
             scope.Start();
             try
             {
@@ -256,7 +256,7 @@ public virtual Response<ApplicationGatewayAvailableWafRuleSetsResult> ListAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGatewayAvailableSslOptions>> ListAvailableSslOptionsAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslOptions");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslOptions");
             scope.Start();
             try
             {
@@ -273,7 +273,7 @@ public virtual async Task<Response<ApplicationGatewayAvailableSslOptions>> ListA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGatewayAvailableSslOptions> ListAvailableSslOptions(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslOptions");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslOptions");
             scope.Start();
             try
             {
@@ -291,7 +291,7 @@ public virtual Response<ApplicationGatewayAvailableSslOptions> ListAvailableSslO
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationGatewaySslPredefinedPolicy>> GetSslPredefinedPolicyAsync(string predefinedPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.GetSslPredefinedPolicy");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.GetSslPredefinedPolicy");
             scope.Start();
             try
             {
@@ -309,7 +309,7 @@ public virtual async Task<Response<ApplicationGatewaySslPredefinedPolicy>> GetSs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationGatewaySslPredefinedPolicy> GetSslPredefinedPolicy(string predefinedPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.GetSslPredefinedPolicy");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.GetSslPredefinedPolicy");
             scope.Start();
             try
             {
@@ -334,7 +334,7 @@ public virtual AsyncPageable<ApplicationGateway> ListAsync(string resourceGroupN
 
             async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -349,7 +349,7 @@ async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -377,7 +377,7 @@ public virtual Pageable<ApplicationGateway> List(string resourceGroupName, Cance
 
             Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -392,7 +392,7 @@ Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -414,7 +414,7 @@ public virtual AsyncPageable<ApplicationGateway> ListAllAsync(CancellationToken
         {
             async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -429,7 +429,7 @@ async Task<Page<ApplicationGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -451,7 +451,7 @@ public virtual Pageable<ApplicationGateway> ListAll(CancellationToken cancellati
         {
             Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -466,7 +466,7 @@ Page<ApplicationGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -488,7 +488,7 @@ public virtual AsyncPageable<ApplicationGatewaySslPredefinedPolicy> ListAvailabl
         {
             async Task<Page<ApplicationGatewaySslPredefinedPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -503,7 +503,7 @@ async Task<Page<ApplicationGatewaySslPredefinedPolicy>> FirstPageFunc(int? pageS
             }
             async Task<Page<ApplicationGatewaySslPredefinedPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -525,7 +525,7 @@ public virtual Pageable<ApplicationGatewaySslPredefinedPolicy> ListAvailableSslP
         {
             Page<ApplicationGatewaySslPredefinedPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -540,7 +540,7 @@ Page<ApplicationGatewaySslPredefinedPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationGatewaySslPredefinedPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.ListAvailableSslPredefinedPolicies");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.ListAvailableSslPredefinedPolicies");
                 scope.Start();
                 try
                 {
@@ -571,7 +571,7 @@ public virtual async Task<ApplicationGatewaysDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -600,7 +600,7 @@ public virtual ApplicationGatewaysDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -634,7 +634,7 @@ public virtual async Task<ApplicationGatewaysCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -668,7 +668,7 @@ public virtual ApplicationGatewaysCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -697,7 +697,7 @@ public virtual async Task<ApplicationGatewaysStartOperation> StartStartAsync(str
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStart");
             scope.Start();
             try
             {
@@ -726,7 +726,7 @@ public virtual ApplicationGatewaysStartOperation StartStart(string resourceGroup
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStart");
             scope.Start();
             try
             {
@@ -755,7 +755,7 @@ public virtual async Task<ApplicationGatewaysStopOperation> StartStopAsync(strin
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStop");
             scope.Start();
             try
             {
@@ -784,7 +784,7 @@ public virtual ApplicationGatewaysStopOperation StartStop(string resourceGroupNa
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartStop");
             scope.Start();
             try
             {
@@ -814,7 +814,7 @@ public virtual async Task<ApplicationGatewaysBackendHealthOperation> StartBacken
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealth");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealth");
             scope.Start();
             try
             {
@@ -844,7 +844,7 @@ public virtual ApplicationGatewaysBackendHealthOperation StartBackendHealth(stri
                 throw new ArgumentNullException(nameof(applicationGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealth");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealth");
             scope.Start();
             try
             {
@@ -879,7 +879,7 @@ public virtual async Task<ApplicationGatewaysBackendHealthOnDemandOperation> Sta
                 throw new ArgumentNullException(nameof(probeRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealthOnDemand");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealthOnDemand");
             scope.Start();
             try
             {
@@ -914,7 +914,7 @@ public virtual ApplicationGatewaysBackendHealthOnDemandOperation StartBackendHea
                 throw new ArgumentNullException(nameof(probeRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysClient.StartBackendHealthOnDemand");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationGatewaysOperations.StartBackendHealthOnDemand");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysRestOperations.cs
index 348e2cb8bac6c..f034639c9410d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationGatewaysRestOperations.cs
@@ -17,20 +17,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ApplicationGatewaysRestClient
+    internal partial class ApplicationGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ApplicationGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsOperations.cs
index af8eb0074d948..7248c85aa7b59 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ApplicationSecurityGroups service client. </summary>
-    public partial class ApplicationSecurityGroupsClient
+    public partial class ApplicationSecurityGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ApplicationSecurityGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ApplicationSecurityGroupsClient for mocking. </summary>
-        protected ApplicationSecurityGroupsClient()
+        internal ApplicationSecurityGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ApplicationSecurityGroupsOperations for mocking. </summary>
+        protected ApplicationSecurityGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ApplicationSecurityGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationSecurityGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ApplicationSecurityGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ApplicationSecurityGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ApplicationSecurityGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ApplicationSecurityGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ApplicationSecurityGroupsClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationSecurityGroup>> GetAsync(string resourceGroupName, string applicationSecurityGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ApplicationSecurityGroup>> GetAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationSecurityGroup> Get(string resourceGroupName, string applicationSecurityGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ApplicationSecurityGroup> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ApplicationSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string applicationSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ApplicationSecurityGroup>> UpdateTagsAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ApplicationSecurityGroup> UpdateTags(string resourceGroupName, string applicationSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<ApplicationSecurityGroup> ListAllAsync(Cancellation
         {
             async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<ApplicationSecurityGroup> ListAll(CancellationToken canc
         {
             Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<ApplicationSecurityGroup> ListAsync(string resource
 
             async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<ApplicationSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ApplicationSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ApplicationSecurityGroup> List(string resourceGroupName,
 
             Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ApplicationSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ApplicationSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<ApplicationSecurityGroupsDeleteOperation> StartDeleteA
                 throw new ArgumentNullException(nameof(applicationSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual ApplicationSecurityGroupsDeleteOperation StartDelete(string resou
                 throw new ArgumentNullException(nameof(applicationSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<ApplicationSecurityGroupsCreateOrUpdateOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual ApplicationSecurityGroupsCreateOrUpdateOperation StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ApplicationSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsRestOperations.cs
index d9534a3b6b9cc..3d4733bab7d41 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ApplicationSecurityGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ApplicationSecurityGroupsRestClient
+    internal partial class ApplicationSecurityGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ApplicationSecurityGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ApplicationSecurityGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ApplicationSecurityGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ApplicationSecurityGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsOperations.cs
similarity index 88%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsOperations.cs
index c0c229f18f689..28f50919ba3ec 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AvailableDelegations service client. </summary>
-    public partial class AvailableDelegationsClient
+    public partial class AvailableDelegationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableDelegationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableDelegationsClient for mocking. </summary>
-        protected AvailableDelegationsClient()
+        internal AvailableDelegationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableDelegationsOperations for mocking. </summary>
+        protected AvailableDelegationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableDelegationsClient. </summary>
+        /// <summary> Initializes a new instance of AvailableDelegationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableDelegationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableDelegationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableDelegationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableDelegationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<AvailableDelegation> ListAsync(string location, Can
 
             async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableDelegation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<AvailableDelegation> List(string location, CancellationT
 
             Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableDelegation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableDelegationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsRestOperations.cs
index 5a8cfe35a1ef5..b862b6f5c8348 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableDelegationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AvailableDelegationsRestClient
+    internal partial class AvailableDelegationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableDelegationsRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableDelegationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableDelegationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableDelegationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesOperations.cs
similarity index 87%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesOperations.cs
index cf384dccd59bf..f7244448c1f72 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AvailableEndpointServices service client. </summary>
-    public partial class AvailableEndpointServicesClient
+    public partial class AvailableEndpointServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableEndpointServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableEndpointServicesClient for mocking. </summary>
-        protected AvailableEndpointServicesClient()
+        internal AvailableEndpointServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableEndpointServicesOperations for mocking. </summary>
+        protected AvailableEndpointServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableEndpointServicesClient. </summary>
+        /// <summary> Initializes a new instance of AvailableEndpointServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableEndpointServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableEndpointServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableEndpointServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableEndpointServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<EndpointServiceResult> ListAsync(string location, C
 
             async Task<Page<EndpointServiceResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<EndpointServiceResult>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<EndpointServiceResult>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<EndpointServiceResult> List(string location, Cancellatio
 
             Page<EndpointServiceResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<EndpointServiceResult> FirstPageFunc(int? pageSizeHint)
             }
             Page<EndpointServiceResult> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableEndpointServicesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesRestOperations.cs
index a472648a71ded..5cca555ec3a2a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableEndpointServicesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AvailableEndpointServicesRestClient
+    internal partial class AvailableEndpointServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableEndpointServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableEndpointServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableEndpointServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableEndpointServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesOperations.cs
index ba794634b5c96..bfa60583804a4 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AvailablePrivateEndpointTypes service client. </summary>
-    public partial class AvailablePrivateEndpointTypesClient
+    public partial class AvailablePrivateEndpointTypesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailablePrivateEndpointTypesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesClient for mocking. </summary>
-        protected AvailablePrivateEndpointTypesClient()
+        internal AvailablePrivateEndpointTypesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesOperations for mocking. </summary>
+        protected AvailablePrivateEndpointTypesOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesClient. </summary>
+        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailablePrivateEndpointTypesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailablePrivateEndpointTypesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailablePrivateEndpointTypesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailablePrivateEndpointTypesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<AvailablePrivateEndpointType> ListAsync(string loca
 
             async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailablePrivateEndpointType>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<AvailablePrivateEndpointType> List(string location, Canc
 
             Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailablePrivateEndpointType> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.List");
                 scope.Start();
                 try
                 {
@@ -140,7 +140,7 @@ public virtual AsyncPageable<AvailablePrivateEndpointType> ListByResourceGroupAs
 
             async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -155,7 +155,7 @@ async Task<Page<AvailablePrivateEndpointType>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailablePrivateEndpointType>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -188,7 +188,7 @@ public virtual Pageable<AvailablePrivateEndpointType> ListByResourceGroup(string
 
             Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ Page<AvailablePrivateEndpointType> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailablePrivateEndpointType> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailablePrivateEndpointTypesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesRestOperations.cs
index 2de800bfb343d..4241099042981 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailablePrivateEndpointTypesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AvailablePrivateEndpointTypesRestClient
+    internal partial class AvailablePrivateEndpointTypesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailablePrivateEndpointTypesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailablePrivateEndpointTypesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailablePrivateEndpointTypesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsOperations.cs
similarity index 88%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsOperations.cs
index 639d5eb5a2256..419edf20658f5 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AvailableResourceGroupDelegations service client. </summary>
-    public partial class AvailableResourceGroupDelegationsClient
+    public partial class AvailableResourceGroupDelegationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableResourceGroupDelegationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsClient for mocking. </summary>
-        protected AvailableResourceGroupDelegationsClient()
+        internal AvailableResourceGroupDelegationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsOperations for mocking. </summary>
+        protected AvailableResourceGroupDelegationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsClient. </summary>
+        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableResourceGroupDelegationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableResourceGroupDelegationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableResourceGroupDelegationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableResourceGroupDelegationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -54,7 +54,7 @@ public virtual AsyncPageable<AvailableDelegation> ListAsync(string location, str
 
             async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -69,7 +69,7 @@ async Task<Page<AvailableDelegation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableDelegation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ public virtual Pageable<AvailableDelegation> List(string location, string resour
 
             Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -117,7 +117,7 @@ Page<AvailableDelegation> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableDelegation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableResourceGroupDelegationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsRestOperations.cs
index 3eebfe4b8ecfd..9e65ad4931e2c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableResourceGroupDelegationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AvailableResourceGroupDelegationsRestClient
+    internal partial class AvailableResourceGroupDelegationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableResourceGroupDelegationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableResourceGroupDelegationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableResourceGroupDelegationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesOperations.cs
index e19e47f034cec..6828a8d60e066 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AvailableServiceAliases service client. </summary>
-    public partial class AvailableServiceAliasesClient
+    public partial class AvailableServiceAliasesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AvailableServiceAliasesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AvailableServiceAliasesClient for mocking. </summary>
-        protected AvailableServiceAliasesClient()
+        internal AvailableServiceAliasesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AvailableServiceAliasesOperations for mocking. </summary>
+        protected AvailableServiceAliasesOperations()
         {
         }
-        /// <summary> Initializes a new instance of AvailableServiceAliasesClient. </summary>
+        /// <summary> Initializes a new instance of AvailableServiceAliasesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AvailableServiceAliasesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AvailableServiceAliasesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AvailableServiceAliasesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AvailableServiceAliasesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<AvailableServiceAlias> ListAsync(string location, C
 
             async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableServiceAlias>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<AvailableServiceAlias> List(string location, Cancellatio
 
             Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableServiceAlias> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.List");
                 scope.Start();
                 try
                 {
@@ -140,7 +140,7 @@ public virtual AsyncPageable<AvailableServiceAlias> ListByResourceGroupAsync(str
 
             async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -155,7 +155,7 @@ async Task<Page<AvailableServiceAlias>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AvailableServiceAlias>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -188,7 +188,7 @@ public virtual Pageable<AvailableServiceAlias> ListByResourceGroup(string resour
 
             Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ Page<AvailableServiceAlias> FirstPageFunc(int? pageSizeHint)
             }
             Page<AvailableServiceAlias> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("AvailableServiceAliasesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesRestOperations.cs
index 70e63c4877e48..4e6522ef95b4a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AvailableServiceAliasesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AvailableServiceAliasesRestClient
+    internal partial class AvailableServiceAliasesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AvailableServiceAliasesRestClient. </summary>
+        /// <summary> Initializes a new instance of AvailableServiceAliasesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AvailableServiceAliasesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AvailableServiceAliasesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsOperations.cs
similarity index 86%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsOperations.cs
index 51c14804a78a3..c9a82df2ff3f3 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AzureFirewallFqdnTags service client. </summary>
-    public partial class AzureFirewallFqdnTagsClient
+    public partial class AzureFirewallFqdnTagsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AzureFirewallFqdnTagsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsClient for mocking. </summary>
-        protected AzureFirewallFqdnTagsClient()
+        internal AzureFirewallFqdnTagsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsOperations for mocking. </summary>
+        protected AzureFirewallFqdnTagsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AzureFirewallFqdnTagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AzureFirewallFqdnTagsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AzureFirewallFqdnTagsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AzureFirewallFqdnTagsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<AzureFirewallFqdnTag> ListAllAsync(CancellationToke
         {
             async Task<Page<AzureFirewallFqdnTag>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<AzureFirewallFqdnTag>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AzureFirewallFqdnTag>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<AzureFirewallFqdnTag> ListAll(CancellationToken cancella
         {
             Page<AzureFirewallFqdnTag> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<AzureFirewallFqdnTag> FirstPageFunc(int? pageSizeHint)
             }
             Page<AzureFirewallFqdnTag> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallFqdnTagsOperations.ListAll");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsRestOperations.cs
index f812c2e83e85c..85baf23667473 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallFqdnTagsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AzureFirewallFqdnTagsRestClient
+    internal partial class AzureFirewallFqdnTagsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsRestClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallFqdnTagsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AzureFirewallFqdnTagsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AzureFirewallFqdnTagsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsOperations.cs
index 2fca296a1abeb..c64e499330378 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The AzureFirewalls service client. </summary>
-    public partial class AzureFirewallsClient
+    public partial class AzureFirewallsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal AzureFirewallsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of AzureFirewallsClient for mocking. </summary>
-        protected AzureFirewallsClient()
+        internal AzureFirewallsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of AzureFirewallsOperations for mocking. </summary>
+        protected AzureFirewallsOperations()
         {
         }
-        /// <summary> Initializes a new instance of AzureFirewallsClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal AzureFirewallsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal AzureFirewallsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new AzureFirewallsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new AzureFirewallsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal AzureFirewallsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<AzureFirewall>> GetAsync(string resourceGroupName, string azureFirewallName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<AzureFirewall>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<AzureFirewall> Get(string resourceGroupName, string azureFirewallName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.Get");
             scope.Start();
             try
             {
@@ -87,7 +87,7 @@ public virtual AsyncPageable<AzureFirewall> ListAsync(string resourceGroupName,
 
             async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AzureFirewall>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -130,7 +130,7 @@ public virtual Pageable<AzureFirewall> List(string resourceGroupName, Cancellati
 
             Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             }
             Page<AzureFirewall> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.List");
                 scope.Start();
                 try
                 {
@@ -167,7 +167,7 @@ public virtual AsyncPageable<AzureFirewall> ListAllAsync(CancellationToken cance
         {
             async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -182,7 +182,7 @@ async Task<Page<AzureFirewall>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<AzureFirewall>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<AzureFirewall> ListAll(CancellationToken cancellationTok
         {
             Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<AzureFirewall> FirstPageFunc(int? pageSizeHint)
             }
             Page<AzureFirewall> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -250,7 +250,7 @@ public virtual async Task<AzureFirewallsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(azureFirewallName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -279,7 +279,7 @@ public virtual AzureFirewallsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(azureFirewallName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -313,7 +313,7 @@ public virtual async Task<AzureFirewallsCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual AzureFirewallsCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -381,7 +381,7 @@ public virtual async Task<AzureFirewallsUpdateTagsOperation> StartUpdateTagsAsyn
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -415,7 +415,7 @@ public virtual AzureFirewallsUpdateTagsOperation StartUpdateTags(string resource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("AzureFirewallsOperations.StartUpdateTags");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsRestOperations.cs
index baa4c1833422a..1b4b9c6c44fb3 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/AzureFirewallsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class AzureFirewallsRestClient
+    internal partial class AzureFirewallsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of AzureFirewallsRestClient. </summary>
+        /// <summary> Initializes a new instance of AzureFirewallsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public AzureFirewallsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public AzureFirewallsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsOperations.cs
index 5363480597fbb..178ddce0ef734 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The BastionHosts service client. </summary>
-    public partial class BastionHostsClient
+    public partial class BastionHostsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BastionHostsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BastionHostsClient for mocking. </summary>
-        protected BastionHostsClient()
+        internal BastionHostsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BastionHostsOperations for mocking. </summary>
+        protected BastionHostsOperations()
         {
         }
-        /// <summary> Initializes a new instance of BastionHostsClient. </summary>
+        /// <summary> Initializes a new instance of BastionHostsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal BastionHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal BastionHostsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new BastionHostsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new BastionHostsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal BastionHostsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BastionHost>> GetAsync(string resourceGroupName, string bastionHostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<BastionHost>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BastionHost> Get(string resourceGroupName, string bastionHostName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual AsyncPageable<BastionHost> ListAsync(CancellationToken cancellati
         {
             async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -96,7 +96,7 @@ async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionHost>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -118,7 +118,7 @@ public virtual Pageable<BastionHost> List(CancellationToken cancellationToken =
         {
             Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -133,7 +133,7 @@ Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionHost> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.List");
                 scope.Start();
                 try
                 {
@@ -161,7 +161,7 @@ public virtual AsyncPageable<BastionHost> ListByResourceGroupAsync(string resour
 
             async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -176,7 +176,7 @@ async Task<Page<BastionHost>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionHost>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -204,7 +204,7 @@ public virtual Pageable<BastionHost> ListByResourceGroup(string resourceGroupNam
 
             Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ Page<BastionHost> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionHost> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -250,7 +250,7 @@ public virtual async Task<BastionHostsDeleteOperation> StartDeleteAsync(string r
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -279,7 +279,7 @@ public virtual BastionHostsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -313,7 +313,7 @@ public virtual async Task<BastionHostsCreateOrUpdateOperation> StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -347,7 +347,7 @@ public virtual BastionHostsCreateOrUpdateOperation StartCreateOrUpdate(string re
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("BastionHostsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("BastionHostsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsRestOperations.cs
index b340a231858a2..9e52dd4b74f1e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BastionHostsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class BastionHostsRestClient
+    internal partial class BastionHostsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BastionHostsRestClient. </summary>
+        /// <summary> Initializes a new instance of BastionHostsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BastionHostsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public BastionHostsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesOperations.cs
similarity index 86%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesOperations.cs
index d4bad50ed4dda..d8cb114165e0b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The BgpServiceCommunities service client. </summary>
-    public partial class BgpServiceCommunitiesClient
+    public partial class BgpServiceCommunitiesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BgpServiceCommunitiesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BgpServiceCommunitiesClient for mocking. </summary>
-        protected BgpServiceCommunitiesClient()
+        internal BgpServiceCommunitiesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BgpServiceCommunitiesOperations for mocking. </summary>
+        protected BgpServiceCommunitiesOperations()
         {
         }
-        /// <summary> Initializes a new instance of BgpServiceCommunitiesClient. </summary>
+        /// <summary> Initializes a new instance of BgpServiceCommunitiesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal BgpServiceCommunitiesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal BgpServiceCommunitiesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new BgpServiceCommunitiesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new BgpServiceCommunitiesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<BgpServiceCommunity> ListAsync(CancellationToken ca
         {
             async Task<Page<BgpServiceCommunity>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<BgpServiceCommunity>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BgpServiceCommunity>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<BgpServiceCommunity> List(CancellationToken cancellation
         {
             Page<BgpServiceCommunity> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<BgpServiceCommunity> FirstPageFunc(int? pageSizeHint)
             }
             Page<BgpServiceCommunity> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BgpServiceCommunitiesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesRestOperations.cs
index c45589380c832..da120d1b1fefa 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/BgpServiceCommunitiesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class BgpServiceCommunitiesRestClient
+    internal partial class BgpServiceCommunitiesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BgpServiceCommunitiesRestClient. </summary>
+        /// <summary> Initializes a new instance of BgpServiceCommunitiesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BgpServiceCommunitiesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public BgpServiceCommunitiesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsOperations.cs
index 9c4d36bd6c89d..d82d4f8284bb4 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ConnectionMonitors service client. </summary>
-    public partial class ConnectionMonitorsClient
+    public partial class ConnectionMonitorsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ConnectionMonitorsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ConnectionMonitorsClient for mocking. </summary>
-        protected ConnectionMonitorsClient()
+        internal ConnectionMonitorsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ConnectionMonitorsOperations for mocking. </summary>
+        protected ConnectionMonitorsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ConnectionMonitorsClient. </summary>
+        /// <summary> Initializes a new instance of ConnectionMonitorsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ConnectionMonitorsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ConnectionMonitorsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ConnectionMonitorsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ConnectionMonitorsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ConnectionMonitorsClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConnectionMonitorResult>> GetAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ConnectionMonitorResult>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConnectionMonitorResult> Get(string resourceGroupName, string networkWatcherName, string connectionMonitorName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<ConnectionMonitorResult> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConnectionMonitorResult>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -106,7 +106,7 @@ public virtual async Task<Response<ConnectionMonitorResult>> UpdateTagsAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConnectionMonitorResult> UpdateTags(string resourceGroupName, string networkWatcherName, string connectionMonitorName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -136,7 +136,7 @@ public virtual AsyncPageable<ConnectionMonitorResult> ListAsync(string resourceG
 
             async Task<Page<ConnectionMonitorResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual Pageable<ConnectionMonitorResult> List(string resourceGroupName,
 
             Page<ConnectionMonitorResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual async Task<ConnectionMonitorsCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -249,7 +249,7 @@ public virtual ConnectionMonitorsCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -283,7 +283,7 @@ public virtual async Task<ConnectionMonitorsDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual ConnectionMonitorsDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -351,7 +351,7 @@ public virtual async Task<ConnectionMonitorsStopOperation> StartStopAsync(string
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStop");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual ConnectionMonitorsStopOperation StartStop(string resourceGroupNam
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStop");
             scope.Start();
             try
             {
@@ -419,7 +419,7 @@ public virtual async Task<ConnectionMonitorsStartOperation> StartStartAsync(stri
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStart");
             scope.Start();
             try
             {
@@ -453,7 +453,7 @@ public virtual ConnectionMonitorsStartOperation StartStart(string resourceGroupN
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartStart");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartStart");
             scope.Start();
             try
             {
@@ -487,7 +487,7 @@ public virtual async Task<ConnectionMonitorsQueryOperation> StartQueryAsync(stri
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartQuery");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartQuery");
             scope.Start();
             try
             {
@@ -521,7 +521,7 @@ public virtual ConnectionMonitorsQueryOperation StartQuery(string resourceGroupN
                 throw new ArgumentNullException(nameof(connectionMonitorName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsClient.StartQuery");
+            using var scope = _clientDiagnostics.CreateScope("ConnectionMonitorsOperations.StartQuery");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsRestOperations.cs
index 4b73296778679..aebfd42980530 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ConnectionMonitorsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ConnectionMonitorsRestClient
+    internal partial class ConnectionMonitorsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ConnectionMonitorsRestClient. </summary>
+        /// <summary> Initializes a new instance of ConnectionMonitorsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ConnectionMonitorsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ConnectionMonitorsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesOperations.cs
index ae5e295c67d79..d8851216f6f98 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The DdosCustomPolicies service client. </summary>
-    public partial class DdosCustomPoliciesClient
+    public partial class DdosCustomPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DdosCustomPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DdosCustomPoliciesClient for mocking. </summary>
-        protected DdosCustomPoliciesClient()
+        internal DdosCustomPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DdosCustomPoliciesOperations for mocking. </summary>
+        protected DdosCustomPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of DdosCustomPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of DdosCustomPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DdosCustomPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DdosCustomPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DdosCustomPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DdosCustomPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal DdosCustomPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosCustomPolicy>> GetAsync(string resourceGroupName, string ddosCustomPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<DdosCustomPolicy>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosCustomPolicy> Get(string resourceGroupName, string ddosCustomPolicyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<DdosCustomPolicy> Get(string resourceGroupName, string d
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosCustomPolicy>> UpdateTagsAsync(string resourceGroupName, string ddosCustomPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<DdosCustomPolicy>> UpdateTagsAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosCustomPolicy> UpdateTags(string resourceGroupName, string ddosCustomPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual async Task<DdosCustomPoliciesDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(ddosCustomPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -158,7 +158,7 @@ public virtual DdosCustomPoliciesDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(ddosCustomPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -192,7 +192,7 @@ public virtual async Task<DdosCustomPoliciesCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -226,7 +226,7 @@ public virtual DdosCustomPoliciesCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosCustomPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesRestOperations.cs
index 8e9a611168add..265b563d8407e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosCustomPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class DdosCustomPoliciesRestClient
+    internal partial class DdosCustomPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DdosCustomPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of DdosCustomPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DdosCustomPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DdosCustomPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansOperations.cs
index 1c9c10bd83196..1c1d1d63579c7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The DdosProtectionPlans service client. </summary>
-    public partial class DdosProtectionPlansClient
+    public partial class DdosProtectionPlansOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DdosProtectionPlansRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DdosProtectionPlansClient for mocking. </summary>
-        protected DdosProtectionPlansClient()
+        internal DdosProtectionPlansRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DdosProtectionPlansOperations for mocking. </summary>
+        protected DdosProtectionPlansOperations()
         {
         }
-        /// <summary> Initializes a new instance of DdosProtectionPlansClient. </summary>
+        /// <summary> Initializes a new instance of DdosProtectionPlansOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DdosProtectionPlansClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DdosProtectionPlansOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DdosProtectionPlansRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DdosProtectionPlansRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal DdosProtectionPlansClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosProtectionPlan>> GetAsync(string resourceGroupName, string ddosProtectionPlanName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<DdosProtectionPlan>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosProtectionPlan> Get(string resourceGroupName, string ddosProtectionPlanName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<DdosProtectionPlan> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DdosProtectionPlan>> UpdateTagsAsync(string resourceGroupName, string ddosProtectionPlanName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<DdosProtectionPlan>> UpdateTagsAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DdosProtectionPlan> UpdateTags(string resourceGroupName, string ddosProtectionPlanName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<DdosProtectionPlan> ListAsync(CancellationToken can
         {
             async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DdosProtectionPlan>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<DdosProtectionPlan> List(CancellationToken cancellationT
         {
             Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             }
             Page<DdosProtectionPlan> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.List");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<DdosProtectionPlan> ListByResourceGroupAsync(string
 
             async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<DdosProtectionPlan>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DdosProtectionPlan>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<DdosProtectionPlan> ListByResourceGroup(string resourceG
 
             Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<DdosProtectionPlan> FirstPageFunc(int? pageSizeHint)
             }
             Page<DdosProtectionPlan> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<DdosProtectionPlansDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(ddosProtectionPlanName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual DdosProtectionPlansDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(ddosProtectionPlanName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<DdosProtectionPlansCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual DdosProtectionPlansCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DdosProtectionPlansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansRestOperations.cs
index a21cdb3287ab5..27f89bb4d6d64 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DdosProtectionPlansRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class DdosProtectionPlansRestClient
+    internal partial class DdosProtectionPlansRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DdosProtectionPlansRestClient. </summary>
+        /// <summary> Initializes a new instance of DdosProtectionPlansRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DdosProtectionPlansRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DdosProtectionPlansRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesOperations.cs
index bb484b68523c7..afb73903a5344 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The DefaultSecurityRules service client. </summary>
-    public partial class DefaultSecurityRulesClient
+    public partial class DefaultSecurityRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DefaultSecurityRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DefaultSecurityRulesClient for mocking. </summary>
-        protected DefaultSecurityRulesClient()
+        internal DefaultSecurityRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DefaultSecurityRulesOperations for mocking. </summary>
+        protected DefaultSecurityRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of DefaultSecurityRulesClient. </summary>
+        /// <summary> Initializes a new instance of DefaultSecurityRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal DefaultSecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal DefaultSecurityRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new DefaultSecurityRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new DefaultSecurityRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DefaultSecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<SecurityRule> ListAsync(string resourceGroupName, s
 
             async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<SecurityRule> List(string resourceGroupName, string netw
 
             Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DefaultSecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesRestOperations.cs
index bba5521c88f21..aa8df1b5cd837 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/DefaultSecurityRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class DefaultSecurityRulesRestClient
+    internal partial class DefaultSecurityRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DefaultSecurityRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of DefaultSecurityRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DefaultSecurityRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public DefaultSecurityRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsOperations.cs
index daaf0c807d1f0..8c1b6a36b0f9e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteCircuitAuthorizations service client. </summary>
-    public partial class ExpressRouteCircuitAuthorizationsClient
+    public partial class ExpressRouteCircuitAuthorizationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitAuthorizationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsClient for mocking. </summary>
-        protected ExpressRouteCircuitAuthorizationsClient()
+        internal ExpressRouteCircuitAuthorizationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsOperations for mocking. </summary>
+        protected ExpressRouteCircuitAuthorizationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitAuthorizationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitAuthorizationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitAuthorizationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitAuthorizationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteCircuitAuthorizationsClient(ClientDiagnostics clientDiagnos
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitAuthorization>> GetAsync(string resourceGroupName, string circuitName, string authorizationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteCircuitAuthorization>> GetAsync(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitAuthorization> Get(string resourceGroupName, string circuitName, string authorizationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteCircuitAuthorization> ListAsync(string
 
             async Task<Page<ExpressRouteCircuitAuthorization>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteCircuitAuthorization>> FirstPageFunc(int? pageSizeHi
             }
             async Task<Page<ExpressRouteCircuitAuthorization>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteCircuitAuthorization> List(string resourceGr
 
             Page<ExpressRouteCircuitAuthorization> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteCircuitAuthorization> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuitAuthorization> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ExpressRouteCircuitAuthorizationsDeleteOperation> Star
                 throw new ArgumentNullException(nameof(authorizationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ExpressRouteCircuitAuthorizationsDeleteOperation StartDelete(stri
                 throw new ArgumentNullException(nameof(authorizationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ExpressRouteCircuitAuthorizationsCreateOrUpdateOperati
                 throw new ArgumentNullException(nameof(authorizationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation StartCre
                 throw new ArgumentNullException(nameof(authorizationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitAuthorizationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsRestOperations.cs
index bdd8e6543c273..da2f20466340d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitAuthorizationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteCircuitAuthorizationsRestClient
+    internal partial class ExpressRouteCircuitAuthorizationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitAuthorizationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitAuthorizationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitAuthorizationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsOperations.cs
index a91c19e8cf0b9..0792ac89a8702 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteCircuitConnections service client. </summary>
-    public partial class ExpressRouteCircuitConnectionsClient
+    public partial class ExpressRouteCircuitConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsClient for mocking. </summary>
-        protected ExpressRouteCircuitConnectionsClient()
+        internal ExpressRouteCircuitConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsOperations for mocking. </summary>
+        protected ExpressRouteCircuitConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal ExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagnostic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<ExpressRouteCircuitConnection>> GetAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<ExpressRouteCircuitConnection> ListAsync(string res
 
             async Task<Page<ExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<ExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuitConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<ExpressRouteCircuitConnection> List(string resourceGroup
 
             Page<ExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<ExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuitConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual async Task<ExpressRouteCircuitConnectionsDeleteOperation> StartDe
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -249,7 +249,7 @@ public virtual ExpressRouteCircuitConnectionsDeleteOperation StartDelete(string
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -293,7 +293,7 @@ public virtual async Task<ExpressRouteCircuitConnectionsCreateOrUpdateOperation>
                 throw new ArgumentNullException(nameof(expressRouteCircuitConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -337,7 +337,7 @@ public virtual ExpressRouteCircuitConnectionsCreateOrUpdateOperation StartCreate
                 throw new ArgumentNullException(nameof(expressRouteCircuitConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsRestOperations.cs
index c55b886d40f9d..8b29fea991e78 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteCircuitConnectionsRestClient
+    internal partial class ExpressRouteCircuitConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsOperations.cs
index a6b7dd5fc9008..5a53f02587e6f 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteCircuitPeerings service client. </summary>
-    public partial class ExpressRouteCircuitPeeringsClient
+    public partial class ExpressRouteCircuitPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsClient for mocking. </summary>
-        protected ExpressRouteCircuitPeeringsClient()
+        internal ExpressRouteCircuitPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsOperations for mocking. </summary>
+        protected ExpressRouteCircuitPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteCircuitPeeringsClient(ClientDiagnostics clientDiagnostics,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitPeering>> GetAsync(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteCircuitPeering>> GetAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitPeering> Get(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteCircuitPeering> ListAsync(string resour
 
             async Task<Page<ExpressRouteCircuitPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteCircuitPeering>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuitPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteCircuitPeering> List(string resourceGroupNam
 
             Page<ExpressRouteCircuitPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteCircuitPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuitPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ExpressRouteCircuitPeeringsDeleteOperation> StartDelet
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ExpressRouteCircuitPeeringsDeleteOperation StartDelete(string res
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ExpressRouteCircuitPeeringsCreateOrUpdateOperation> St
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ExpressRouteCircuitPeeringsCreateOrUpdateOperation StartCreateOrU
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsRestOperations.cs
index fa6792f37d9c8..d2b78621243cf 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteCircuitPeeringsRestClient
+    internal partial class ExpressRouteCircuitPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsOperations.cs
index 17e9775ec5360..3219f03761244 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteCircuits service client. </summary>
-    public partial class ExpressRouteCircuitsClient
+    public partial class ExpressRouteCircuitsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCircuitsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitsClient for mocking. </summary>
-        protected ExpressRouteCircuitsClient()
+        internal ExpressRouteCircuitsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCircuitsOperations for mocking. </summary>
+        protected ExpressRouteCircuitsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCircuitsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCircuitsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCircuitsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCircuitsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCircuitsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRouteCircuitsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuit>> GetAsync(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ExpressRouteCircuit>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuit> Get(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRouteCircuit> Get(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuit>> UpdateTagsAsync(string resourceGroupName, string circuitName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ExpressRouteCircuit>> UpdateTagsAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuit> UpdateTags(string resourceGroupName, string circuitName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<ExpressRouteCircuit> UpdateTags(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitStats>> GetStatsAsync(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetStats");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<ExpressRouteCircuitStats>> GetStatsAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitStats> GetStats(string resourceGroupName, string circuitName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetStats");
             scope.Start();
             try
             {
@@ -160,7 +160,7 @@ public virtual Response<ExpressRouteCircuitStats> GetStats(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCircuitStats>> GetPeeringStatsAsync(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetPeeringStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetPeeringStats");
             scope.Start();
             try
             {
@@ -180,7 +180,7 @@ public virtual async Task<Response<ExpressRouteCircuitStats>> GetPeeringStatsAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCircuitStats> GetPeeringStats(string resourceGroupName, string circuitName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.GetPeeringStats");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.GetPeeringStats");
             scope.Start();
             try
             {
@@ -205,7 +205,7 @@ public virtual AsyncPageable<ExpressRouteCircuit> ListAsync(string resourceGroup
 
             async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -220,7 +220,7 @@ async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuit>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -248,7 +248,7 @@ public virtual Pageable<ExpressRouteCircuit> List(string resourceGroupName, Canc
 
             Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuit> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.List");
                 scope.Start();
                 try
                 {
@@ -285,7 +285,7 @@ public virtual AsyncPageable<ExpressRouteCircuit> ListAllAsync(CancellationToken
         {
             async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -300,7 +300,7 @@ async Task<Page<ExpressRouteCircuit>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCircuit>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -322,7 +322,7 @@ public virtual Pageable<ExpressRouteCircuit> ListAll(CancellationToken cancellat
         {
             Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -337,7 +337,7 @@ Page<ExpressRouteCircuit> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCircuit> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -368,7 +368,7 @@ public virtual async Task<ExpressRouteCircuitsDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(circuitName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -397,7 +397,7 @@ public virtual ExpressRouteCircuitsDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(circuitName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -431,7 +431,7 @@ public virtual async Task<ExpressRouteCircuitsCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -465,7 +465,7 @@ public virtual ExpressRouteCircuitsCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -504,7 +504,7 @@ public virtual async Task<ExpressRouteCircuitsListArpTableOperation> StartListAr
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -543,7 +543,7 @@ public virtual ExpressRouteCircuitsListArpTableOperation StartListArpTable(strin
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -582,7 +582,7 @@ public virtual async Task<ExpressRouteCircuitsListRoutesTableOperation> StartLis
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
@@ -621,7 +621,7 @@ public virtual ExpressRouteCircuitsListRoutesTableOperation StartListRoutesTable
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
@@ -660,7 +660,7 @@ public virtual async Task<ExpressRouteCircuitsListRoutesTableSummaryOperation> S
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
@@ -699,7 +699,7 @@ public virtual ExpressRouteCircuitsListRoutesTableSummaryOperation StartListRout
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCircuitsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsRestOperations.cs
index d0db4e6a561c1..3a11f25fd4fc1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCircuitsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteCircuitsRestClient
+    internal partial class ExpressRouteCircuitsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCircuitsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCircuitsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCircuitsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCircuitsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsOperations.cs
index 34c790663d2c4..7cddefd4946cb 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteConnections service client. </summary>
-    public partial class ExpressRouteConnectionsClient
+    public partial class ExpressRouteConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteConnectionsClient for mocking. </summary>
-        protected ExpressRouteConnectionsClient()
+        internal ExpressRouteConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteConnectionsOperations for mocking. </summary>
+        protected ExpressRouteConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRouteConnectionsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteConnection>> GetAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ExpressRouteConnection>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteConnection> Get(string resourceGroupName, string expressRouteGatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRouteConnection> Get(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteConnectionList>> ListAsync(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.List");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<ExpressRouteConnectionList>> ListAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteConnectionList> List(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.List");
             scope.Start();
             try
             {
@@ -139,7 +139,7 @@ public virtual async Task<ExpressRouteConnectionsCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(putExpressRouteConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -178,7 +178,7 @@ public virtual ExpressRouteConnectionsCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(putExpressRouteConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -212,7 +212,7 @@ public virtual async Task<ExpressRouteConnectionsDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -246,7 +246,7 @@ public virtual ExpressRouteConnectionsDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsRestOperations.cs
index 0113c2c1e0a02..c998dbf72561b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteConnectionsRestClient
+    internal partial class ExpressRouteConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsOperations.cs
index ede41f7ac94d1..5659d5d6237e4 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteCrossConnectionPeerings service client. </summary>
-    public partial class ExpressRouteCrossConnectionPeeringsClient
+    public partial class ExpressRouteCrossConnectionPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCrossConnectionPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsClient for mocking. </summary>
-        protected ExpressRouteCrossConnectionPeeringsClient()
+        internal ExpressRouteCrossConnectionPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsOperations for mocking. </summary>
+        protected ExpressRouteCrossConnectionPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCrossConnectionPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCrossConnectionPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCrossConnectionPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCrossConnectionPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteCrossConnectionPeeringsClient(ClientDiagnostics clientDiagn
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCrossConnectionPeering>> GetAsync(string resourceGroupName, string crossConnectionName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteCrossConnectionPeering>> GetAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCrossConnectionPeering> Get(string resourceGroupName, string crossConnectionName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteCrossConnectionPeering> ListAsync(strin
 
             async Task<Page<ExpressRouteCrossConnectionPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteCrossConnectionPeering>> FirstPageFunc(int? pageSize
             }
             async Task<Page<ExpressRouteCrossConnectionPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteCrossConnectionPeering> List(string resource
 
             Page<ExpressRouteCrossConnectionPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteCrossConnectionPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCrossConnectionPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ExpressRouteCrossConnectionPeeringsDeleteOperation> St
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ExpressRouteCrossConnectionPeeringsDeleteOperation StartDelete(st
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ExpressRouteCrossConnectionPeeringsCreateOrUpdateOpera
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation StartC
                 throw new ArgumentNullException(nameof(peeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsRestOperations.cs
index 0619e1ceeff11..5a94e9a84acde 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteCrossConnectionPeeringsRestClient
+    internal partial class ExpressRouteCrossConnectionPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCrossConnectionPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCrossConnectionPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsOperations.cs
index bf03c1cb42598..8708585f9e7d7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteCrossConnections service client. </summary>
-    public partial class ExpressRouteCrossConnectionsClient
+    public partial class ExpressRouteCrossConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteCrossConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsClient for mocking. </summary>
-        protected ExpressRouteCrossConnectionsClient()
+        internal ExpressRouteCrossConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsOperations for mocking. </summary>
+        protected ExpressRouteCrossConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteCrossConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteCrossConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteCrossConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteCrossConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRouteCrossConnectionsClient(ClientDiagnostics clientDiagnostics,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCrossConnection>> GetAsync(string resourceGroupName, string crossConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ExpressRouteCrossConnection>> GetAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCrossConnection> Get(string resourceGroupName, string crossConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRouteCrossConnection> Get(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteCrossConnection>> UpdateTagsAsync(string resourceGroupName, string crossConnectionName, TagsObject crossConnectionParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ExpressRouteCrossConnection>> UpdateTagsAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteCrossConnection> UpdateTags(string resourceGroupName, string crossConnectionName, TagsObject crossConnectionParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<ExpressRouteCrossConnection> ListAsync(Cancellation
         {
             async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCrossConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<ExpressRouteCrossConnection> List(CancellationToken canc
         {
             Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCrossConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<ExpressRouteCrossConnection> ListByResourceGroupAsy
 
             async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<ExpressRouteCrossConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteCrossConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ExpressRouteCrossConnection> ListByResourceGroup(string
 
             Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ExpressRouteCrossConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteCrossConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<ExpressRouteCrossConnectionsCreateOrUpdateOperation> S
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual ExpressRouteCrossConnectionsCreateOrUpdateOperation StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -368,7 +368,7 @@ public virtual async Task<ExpressRouteCrossConnectionsListArpTableOperation> Sta
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -407,7 +407,7 @@ public virtual ExpressRouteCrossConnectionsListArpTableOperation StartListArpTab
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListArpTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListArpTable");
             scope.Start();
             try
             {
@@ -446,7 +446,7 @@ public virtual async Task<ExpressRouteCrossConnectionsListRoutesTableSummaryOper
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
@@ -485,7 +485,7 @@ public virtual ExpressRouteCrossConnectionsListRoutesTableSummaryOperation Start
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTableSummary");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTableSummary");
             scope.Start();
             try
             {
@@ -524,7 +524,7 @@ public virtual async Task<ExpressRouteCrossConnectionsListRoutesTableOperation>
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
@@ -563,7 +563,7 @@ public virtual ExpressRouteCrossConnectionsListRoutesTableOperation StartListRou
                 throw new ArgumentNullException(nameof(devicePath));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsClient.StartListRoutesTable");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteCrossConnectionsOperations.StartListRoutesTable");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsRestOperations.cs
index 7a0bf466d962e..39ced2fa93cc1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteCrossConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteCrossConnectionsRestClient
+    internal partial class ExpressRouteCrossConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteCrossConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteCrossConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteCrossConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysOperations.cs
similarity index 92%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysOperations.cs
index bc65c118b1e34..1175728661d65 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteGateways service client. </summary>
-    public partial class ExpressRouteGatewaysClient
+    public partial class ExpressRouteGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteGatewaysClient for mocking. </summary>
-        protected ExpressRouteGatewaysClient()
+        internal ExpressRouteGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteGatewaysOperations for mocking. </summary>
+        protected ExpressRouteGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -40,7 +40,7 @@ internal ExpressRouteGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteGatewayList>> ListBySubscriptionAsync(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListBySubscription");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListBySubscription");
             scope.Start();
             try
             {
@@ -57,7 +57,7 @@ public virtual async Task<Response<ExpressRouteGatewayList>> ListBySubscriptionA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteGatewayList> ListBySubscription(CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListBySubscription");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListBySubscription");
             scope.Start();
             try
             {
@@ -75,7 +75,7 @@ public virtual Response<ExpressRouteGatewayList> ListBySubscription(Cancellation
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteGatewayList>> ListByResourceGroupAsync(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListByResourceGroup");
             scope.Start();
             try
             {
@@ -93,7 +93,7 @@ public virtual async Task<Response<ExpressRouteGatewayList>> ListByResourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteGatewayList> ListByResourceGroup(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.ListByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.ListByResourceGroup");
             scope.Start();
             try
             {
@@ -112,7 +112,7 @@ public virtual Response<ExpressRouteGatewayList> ListByResourceGroup(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteGateway>> GetAsync(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -131,7 +131,7 @@ public virtual async Task<Response<ExpressRouteGateway>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteGateway> Get(string resourceGroupName, string expressRouteGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -164,7 +164,7 @@ public virtual async Task<ExpressRouteGatewaysCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(putExpressRouteGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -198,7 +198,7 @@ public virtual ExpressRouteGatewaysCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(putExpressRouteGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual async Task<ExpressRouteGatewaysDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(expressRouteGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -256,7 +256,7 @@ public virtual ExpressRouteGatewaysDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(expressRouteGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysRestOperations.cs
index 62e382331967a..9b03a7170bef6 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteGatewaysRestClient
+    internal partial class ExpressRouteGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksOperations.cs
index 93d8cb47dc292..a9187ed39d118 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteLinks service client. </summary>
-    public partial class ExpressRouteLinksClient
+    public partial class ExpressRouteLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteLinksClient for mocking. </summary>
-        protected ExpressRouteLinksClient()
+        internal ExpressRouteLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteLinksOperations for mocking. </summary>
+        protected ExpressRouteLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteLinksClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ExpressRouteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRouteLink>> GetAsync(string resourceGroupName, string expressRoutePortName, string linkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ExpressRouteLink>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRouteLink> Get(string resourceGroupName, string expressRoutePortName, string linkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ExpressRouteLink> ListAsync(string resourceGroupNam
 
             async Task<Page<ExpressRouteLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ExpressRouteLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ExpressRouteLink> List(string resourceGroupName, string
 
             Page<ExpressRouteLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ExpressRouteLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteLinksOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksRestOperations.cs
index 17c7f8c59237f..80b0189ab1107 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteLinksRestClient
+    internal partial class ExpressRouteLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsOperations.cs
similarity index 88%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsOperations.cs
index f83b137eb9a51..79be299578799 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRoutePortsLocations service client. </summary>
-    public partial class ExpressRoutePortsLocationsClient
+    public partial class ExpressRoutePortsLocationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRoutePortsLocationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsClient for mocking. </summary>
-        protected ExpressRoutePortsLocationsClient()
+        internal ExpressRoutePortsLocationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsOperations for mocking. </summary>
+        protected ExpressRoutePortsLocationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRoutePortsLocationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRoutePortsLocationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRoutePortsLocationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRoutePortsLocationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ internal ExpressRoutePortsLocationsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRoutePortsLocation>> GetAsync(string locationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.Get");
             scope.Start();
             try
             {
@@ -60,7 +60,7 @@ public virtual async Task<Response<ExpressRoutePortsLocation>> GetAsync(string l
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRoutePortsLocation> Get(string locationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.Get");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual AsyncPageable<ExpressRoutePortsLocation> ListAsync(CancellationTo
         {
             async Task<Page<ExpressRoutePortsLocation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ async Task<Page<ExpressRoutePortsLocation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRoutePortsLocation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ public virtual Pageable<ExpressRoutePortsLocation> List(CancellationToken cancel
         {
             Page<ExpressRoutePortsLocation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -131,7 +131,7 @@ Page<ExpressRoutePortsLocation> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRoutePortsLocation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsLocationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsRestOperations.cs
index f16988c637ea8..7b6cf558f28aa 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsLocationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRoutePortsLocationsRestClient
+    internal partial class ExpressRoutePortsLocationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsLocationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRoutePortsLocationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRoutePortsLocationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsOperations.cs
index 2a09eb6700088..a697382849ceb 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRoutePorts service client. </summary>
-    public partial class ExpressRoutePortsClient
+    public partial class ExpressRoutePortsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRoutePortsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRoutePortsClient for mocking. </summary>
-        protected ExpressRoutePortsClient()
+        internal ExpressRoutePortsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRoutePortsOperations for mocking. </summary>
+        protected ExpressRoutePortsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRoutePortsClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRoutePortsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRoutePortsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRoutePortsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRoutePortsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ExpressRoutePortsClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRoutePort>> GetAsync(string resourceGroupName, string expressRoutePortName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ExpressRoutePort>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRoutePort> Get(string resourceGroupName, string expressRoutePortName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ExpressRoutePort> Get(string resourceGroupName, string e
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ExpressRoutePort>> UpdateTagsAsync(string resourceGroupName, string expressRoutePortName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ExpressRoutePort>> UpdateTagsAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ExpressRoutePort> UpdateTags(string resourceGroupName, string expressRoutePortName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<ExpressRoutePort> ListByResourceGroupAsync(string r
 
             async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRoutePort>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<ExpressRoutePort> ListByResourceGroup(string resourceGro
 
             Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRoutePort> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<ExpressRoutePort> ListAsync(CancellationToken cance
         {
             async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<ExpressRoutePort>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRoutePort>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<ExpressRoutePort> List(CancellationToken cancellationTok
         {
             Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<ExpressRoutePort> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRoutePort> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.List");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<ExpressRoutePortsDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(expressRoutePortName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual ExpressRoutePortsDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(expressRoutePortName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<ExpressRoutePortsCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual ExpressRoutePortsCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ExpressRoutePortsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsRestOperations.cs
index 86de73e1931e3..c2e8f529fc26b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRoutePortsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRoutePortsRestClient
+    internal partial class ExpressRoutePortsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRoutePortsRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRoutePortsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRoutePortsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRoutePortsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersOperations.cs
similarity index 85%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersOperations.cs
index 86f16918497bd..dd8dacf088904 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ExpressRouteServiceProviders service client. </summary>
-    public partial class ExpressRouteServiceProvidersClient
+    public partial class ExpressRouteServiceProvidersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ExpressRouteServiceProvidersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersClient for mocking. </summary>
-        protected ExpressRouteServiceProvidersClient()
+        internal ExpressRouteServiceProvidersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersOperations for mocking. </summary>
+        protected ExpressRouteServiceProvidersOperations()
         {
         }
-        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ExpressRouteServiceProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ExpressRouteServiceProvidersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ExpressRouteServiceProvidersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ExpressRouteServiceProvidersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<ExpressRouteServiceProvider> ListAsync(Cancellation
         {
             async Task<Page<ExpressRouteServiceProvider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -58,7 +58,7 @@ async Task<Page<ExpressRouteServiceProvider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ExpressRouteServiceProvider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -80,7 +80,7 @@ public virtual Pageable<ExpressRouteServiceProvider> List(CancellationToken canc
         {
             Page<ExpressRouteServiceProvider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -95,7 +95,7 @@ Page<ExpressRouteServiceProvider> FirstPageFunc(int? pageSizeHint)
             }
             Page<ExpressRouteServiceProvider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ExpressRouteServiceProvidersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersRestOperations.cs
index f4f1e3ee5ad02..ceef124f0040b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ExpressRouteServiceProvidersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ExpressRouteServiceProvidersRestClient
+    internal partial class ExpressRouteServiceProvidersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersRestClient. </summary>
+        /// <summary> Initializes a new instance of ExpressRouteServiceProvidersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ExpressRouteServiceProvidersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ExpressRouteServiceProvidersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesOperations.cs
index efe1c5d097575..07ccaf5127c34 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The FirewallPolicies service client. </summary>
-    public partial class FirewallPoliciesClient
+    public partial class FirewallPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FirewallPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FirewallPoliciesClient for mocking. </summary>
-        protected FirewallPoliciesClient()
+        internal FirewallPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FirewallPoliciesOperations for mocking. </summary>
+        protected FirewallPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FirewallPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FirewallPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FirewallPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FirewallPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FirewallPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal FirewallPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FirewallPolicy>> GetAsync(string resourceGroupName, string firewallPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FirewallPolicy>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FirewallPolicy> Get(string resourceGroupName, string firewallPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<FirewallPolicy> ListAsync(string resourceGroupName,
 
             async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<FirewallPolicy> List(string resourceGroupName, Cancellat
 
             Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<FirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<FirewallPolicy> ListAllAsync(CancellationToken canc
         {
             async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<FirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<FirewallPolicy> ListAll(CancellationToken cancellationTo
         {
             Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<FirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<FirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ public virtual async Task<FirewallPoliciesDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(firewallPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -281,7 +281,7 @@ public virtual FirewallPoliciesDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(firewallPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual async Task<FirewallPoliciesCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual FirewallPoliciesCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesRestOperations.cs
index 867a9ee9f44dd..6b09fce7419c5 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class FirewallPoliciesRestClient
+    internal partial class FirewallPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FirewallPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FirewallPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FirewallPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsOperations.cs
index 6e7aaf56b7cc0..1b1e7bc1a0861 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The FirewallPolicyRuleGroups service client. </summary>
-    public partial class FirewallPolicyRuleGroupsClient
+    public partial class FirewallPolicyRuleGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FirewallPolicyRuleGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsClient for mocking. </summary>
-        protected FirewallPolicyRuleGroupsClient()
+        internal FirewallPolicyRuleGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsOperations for mocking. </summary>
+        protected FirewallPolicyRuleGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FirewallPolicyRuleGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FirewallPolicyRuleGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FirewallPolicyRuleGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FirewallPolicyRuleGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal FirewallPolicyRuleGroupsClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FirewallPolicyRuleGroup>> GetAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FirewallPolicyRuleGroup>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FirewallPolicyRuleGroup> Get(string resourceGroupName, string firewallPolicyName, string ruleGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<FirewallPolicyRuleGroup> ListAsync(string resourceG
 
             async Task<Page<FirewallPolicyRuleGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<FirewallPolicyRuleGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FirewallPolicyRuleGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<FirewallPolicyRuleGroup> List(string resourceGroupName,
 
             Page<FirewallPolicyRuleGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<FirewallPolicyRuleGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<FirewallPolicyRuleGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<FirewallPolicyRuleGroupsDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(ruleGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual FirewallPolicyRuleGroupsDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(ruleGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<FirewallPolicyRuleGroupsCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual FirewallPolicyRuleGroupsCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FirewallPolicyRuleGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsRestOperations.cs
index d85c103d6cc9b..b61c22b41ddb7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FirewallPolicyRuleGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class FirewallPolicyRuleGroupsRestClient
+    internal partial class FirewallPolicyRuleGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of FirewallPolicyRuleGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FirewallPolicyRuleGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FirewallPolicyRuleGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsOperations.cs
index 7b9e032248681..9da716756bcc3 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The FlowLogs service client. </summary>
-    public partial class FlowLogsClient
+    public partial class FlowLogsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FlowLogsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FlowLogsClient for mocking. </summary>
-        protected FlowLogsClient()
+        internal FlowLogsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FlowLogsOperations for mocking. </summary>
+        protected FlowLogsOperations()
         {
         }
-        /// <summary> Initializes a new instance of FlowLogsClient. </summary>
+        /// <summary> Initializes a new instance of FlowLogsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal FlowLogsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal FlowLogsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new FlowLogsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new FlowLogsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal FlowLogsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FlowLog>> GetAsync(string resourceGroupName, string networkWatcherName, string flowLogName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FlowLog>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FlowLog> Get(string resourceGroupName, string networkWatcherName, string flowLogName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<FlowLog> ListAsync(string resourceGroupName, string
 
             async Task<Page<FlowLog>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<FlowLog>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FlowLog>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<FlowLog> List(string resourceGroupName, string networkWa
 
             Page<FlowLog> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<FlowLog> FirstPageFunc(int? pageSizeHint)
             }
             Page<FlowLog> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<FlowLogsCreateOrUpdateOperation> StartCreateOrUpdateAs
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual FlowLogsCreateOrUpdateOperation StartCreateOrUpdate(string resour
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<FlowLogsDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(flowLogName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual FlowLogsDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(flowLogName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("FlowLogsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("FlowLogsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsRestOperations.cs
index 632b58b3a088c..722681fe31d12 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/FlowLogsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class FlowLogsRestClient
+    internal partial class FlowLogsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FlowLogsRestClient. </summary>
+        /// <summary> Initializes a new instance of FlowLogsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FlowLogsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public FlowLogsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesOperations.cs
index fc92a54a3b8eb..cdadc6471a0f5 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The HubRouteTables service client. </summary>
-    public partial class HubRouteTablesClient
+    public partial class HubRouteTablesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal HubRouteTablesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of HubRouteTablesClient for mocking. </summary>
-        protected HubRouteTablesClient()
+        internal HubRouteTablesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of HubRouteTablesOperations for mocking. </summary>
+        protected HubRouteTablesOperations()
         {
         }
-        /// <summary> Initializes a new instance of HubRouteTablesClient. </summary>
+        /// <summary> Initializes a new instance of HubRouteTablesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal HubRouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal HubRouteTablesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new HubRouteTablesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new HubRouteTablesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal HubRouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<HubRouteTable>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<HubRouteTable>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<HubRouteTable> Get(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<HubRouteTable> ListAsync(string resourceGroupName,
 
             async Task<Page<HubRouteTable>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<HubRouteTable>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<HubRouteTable>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<HubRouteTable> List(string resourceGroupName, string vir
 
             Page<HubRouteTable> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<HubRouteTable> FirstPageFunc(int? pageSizeHint)
             }
             Page<HubRouteTable> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<HubRouteTablesCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(routeTableParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual HubRouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(routeTableParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<HubRouteTablesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual HubRouteTablesDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("HubRouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesRestOperations.cs
index 1ce98e9dca6d1..f2bd585bbed7a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubRouteTablesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class HubRouteTablesRestClient
+    internal partial class HubRouteTablesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of HubRouteTablesRestClient. </summary>
+        /// <summary> Initializes a new instance of HubRouteTablesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public HubRouteTablesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public HubRouteTablesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsOperations.cs
index 48a67d60eff32..69ed25ed6d031 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The HubVirtualNetworkConnections service client. </summary>
-    public partial class HubVirtualNetworkConnectionsClient
+    public partial class HubVirtualNetworkConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal HubVirtualNetworkConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsClient for mocking. </summary>
-        protected HubVirtualNetworkConnectionsClient()
+        internal HubVirtualNetworkConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsOperations for mocking. </summary>
+        protected HubVirtualNetworkConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal HubVirtualNetworkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal HubVirtualNetworkConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new HubVirtualNetworkConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new HubVirtualNetworkConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal HubVirtualNetworkConnectionsClient(ClientDiagnostics clientDiagnostics,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<HubVirtualNetworkConnection>> GetAsync(string resourceGroupName, string virtualHubName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<HubVirtualNetworkConnection>> GetAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<HubVirtualNetworkConnection> Get(string resourceGroupName, string virtualHubName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<HubVirtualNetworkConnection> ListAsync(string resou
 
             async Task<Page<HubVirtualNetworkConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<HubVirtualNetworkConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<HubVirtualNetworkConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<HubVirtualNetworkConnection> List(string resourceGroupNa
 
             Page<HubVirtualNetworkConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<HubVirtualNetworkConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<HubVirtualNetworkConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("HubVirtualNetworkConnectionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsRestOperations.cs
index b46a51ad909a1..d99c97d619771 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/HubVirtualNetworkConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class HubVirtualNetworkConnectionsRestClient
+    internal partial class HubVirtualNetworkConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of HubVirtualNetworkConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public HubVirtualNetworkConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public HubVirtualNetworkConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesOperations.cs
index 04b6973e582b2..df406d63d6a0d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The InboundNatRules service client. </summary>
-    public partial class InboundNatRulesClient
+    public partial class InboundNatRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal InboundNatRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of InboundNatRulesClient for mocking. </summary>
-        protected InboundNatRulesClient()
+        internal InboundNatRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of InboundNatRulesOperations for mocking. </summary>
+        protected InboundNatRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of InboundNatRulesClient. </summary>
+        /// <summary> Initializes a new instance of InboundNatRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal InboundNatRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal InboundNatRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new InboundNatRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new InboundNatRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal InboundNatRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<InboundNatRule>> GetAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<InboundNatRule>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<InboundNatRule> Get(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<InboundNatRule> ListAsync(string resourceGroupName,
 
             async Task<Page<InboundNatRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<InboundNatRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<InboundNatRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ public virtual Pageable<InboundNatRule> List(string resourceGroupName, string lo
 
             Page<InboundNatRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -159,7 +159,7 @@ Page<InboundNatRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<InboundNatRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -195,7 +195,7 @@ public virtual async Task<InboundNatRulesDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(inboundNatRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual InboundNatRulesDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(inboundNatRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -268,7 +268,7 @@ public virtual async Task<InboundNatRulesCreateOrUpdateOperation> StartCreateOrU
                 throw new ArgumentNullException(nameof(inboundNatRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -307,7 +307,7 @@ public virtual InboundNatRulesCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(inboundNatRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("InboundNatRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesRestOperations.cs
index 9a01cf8fdd4ba..4a2ebc2a5ccc5 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/InboundNatRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class InboundNatRulesRestClient
+    internal partial class InboundNatRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of InboundNatRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of InboundNatRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public InboundNatRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public InboundNatRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsOperations.cs
index 42cf3b88fa403..af6fe07ed3e90 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The IpAllocations service client. </summary>
-    public partial class IpAllocationsClient
+    public partial class IpAllocationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal IpAllocationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of IpAllocationsClient for mocking. </summary>
-        protected IpAllocationsClient()
+        internal IpAllocationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of IpAllocationsOperations for mocking. </summary>
+        protected IpAllocationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of IpAllocationsClient. </summary>
+        /// <summary> Initializes a new instance of IpAllocationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal IpAllocationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal IpAllocationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new IpAllocationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new IpAllocationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal IpAllocationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpAllocation>> GetAsync(string resourceGroupName, string ipAllocationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<IpAllocation>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpAllocation> Get(string resourceGroupName, string ipAllocationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<IpAllocation> Get(string resourceGroupName, string ipAll
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpAllocation>> UpdateTagsAsync(string resourceGroupName, string ipAllocationName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<IpAllocation>> UpdateTagsAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpAllocation> UpdateTags(string resourceGroupName, string ipAllocationName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<IpAllocation> ListAsync(CancellationToken cancellat
         {
             async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpAllocation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<IpAllocation> List(CancellationToken cancellationToken =
         {
             Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpAllocation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<IpAllocation> ListByResourceGroupAsync(string resou
 
             async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<IpAllocation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpAllocation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<IpAllocation> ListByResourceGroup(string resourceGroupNa
 
             Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<IpAllocation> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpAllocation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<IpAllocationsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(ipAllocationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual IpAllocationsDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(ipAllocationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<IpAllocationsCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual IpAllocationsCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpAllocationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpAllocationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsRestOperations.cs
index c1e04d51466cb..4b14544d09a25 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpAllocationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class IpAllocationsRestClient
+    internal partial class IpAllocationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of IpAllocationsRestClient. </summary>
+        /// <summary> Initializes a new instance of IpAllocationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public IpAllocationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public IpAllocationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsOperations.cs
index cdc0ee0d5df94..d5f8892172f20 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The IpGroups service client. </summary>
-    public partial class IpGroupsClient
+    public partial class IpGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal IpGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of IpGroupsClient for mocking. </summary>
-        protected IpGroupsClient()
+        internal IpGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of IpGroupsOperations for mocking. </summary>
+        protected IpGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of IpGroupsClient. </summary>
+        /// <summary> Initializes a new instance of IpGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal IpGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal IpGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new IpGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new IpGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal IpGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpGroup>> GetAsync(string resourceGroupName, string ipGroupsName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<IpGroup>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpGroup> Get(string resourceGroupName, string ipGroupsName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<IpGroup> Get(string resourceGroupName, string ipGroupsNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IpGroup>> UpdateGroupsAsync(string resourceGroupName, string ipGroupsName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.UpdateGroups");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.UpdateGroups");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<IpGroup>> UpdateGroupsAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IpGroup> UpdateGroups(string resourceGroupName, string ipGroupsName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.UpdateGroups");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.UpdateGroups");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<IpGroup> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<IpGroup> ListByResourceGroup(string resourceGroupName, C
 
             Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<IpGroup> ListAsync(CancellationToken cancellationTo
         {
             async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<IpGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<IpGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<IpGroup> List(CancellationToken cancellationToken = defa
         {
             Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<IpGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<IpGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -297,7 +297,7 @@ public virtual async Task<IpGroupsCreateOrUpdateOperation> StartCreateOrUpdateAs
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -331,7 +331,7 @@ public virtual IpGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resour
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -360,7 +360,7 @@ public virtual async Task<IpGroupsDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(ipGroupsName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual IpGroupsDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(ipGroupsName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("IpGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("IpGroupsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsRestOperations.cs
index 133b9efc26229..5546be334c3d4 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/IpGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class IpGroupsRestClient
+    internal partial class IpGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of IpGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of IpGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public IpGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public IpGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsOperations.cs
index 959fa562cba30..9d228d8a4dc34 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancerBackendAddressPools service client. </summary>
-    public partial class LoadBalancerBackendAddressPoolsClient
+    public partial class LoadBalancerBackendAddressPoolsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerBackendAddressPoolsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsClient for mocking. </summary>
-        protected LoadBalancerBackendAddressPoolsClient()
+        internal LoadBalancerBackendAddressPoolsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsOperations for mocking. </summary>
+        protected LoadBalancerBackendAddressPoolsOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerBackendAddressPoolsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerBackendAddressPoolsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerBackendAddressPoolsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerBackendAddressPoolsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerBackendAddressPoolsClient(ClientDiagnostics clientDiagnosti
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BackendAddressPool>> GetAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<BackendAddressPool>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BackendAddressPool> Get(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<BackendAddressPool> ListAsync(string resourceGroupN
 
             async Task<Page<BackendAddressPool>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<BackendAddressPool>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BackendAddressPool>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<BackendAddressPool> List(string resourceGroupName, strin
 
             Page<BackendAddressPool> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<BackendAddressPool> FirstPageFunc(int? pageSizeHint)
             }
             Page<BackendAddressPool> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<LoadBalancerBackendAddressPoolsCreateOrUpdateOperation
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual LoadBalancerBackendAddressPoolsCreateOrUpdateOperation StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<LoadBalancerBackendAddressPoolsDeleteOperation> StartD
                 throw new ArgumentNullException(nameof(backendAddressPoolName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual LoadBalancerBackendAddressPoolsDeleteOperation StartDelete(string
                 throw new ArgumentNullException(nameof(backendAddressPoolName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerBackendAddressPoolsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsRestOperations.cs
index 719c1774f6545..0a6e4be50fa35 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerBackendAddressPoolsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancerBackendAddressPoolsRestClient
+    internal partial class LoadBalancerBackendAddressPoolsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerBackendAddressPoolsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerBackendAddressPoolsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerBackendAddressPoolsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsOperations.cs
similarity index 89%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsOperations.cs
index 39d561ef5877d..b893ce924687e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancerFrontendIPConfigurations service client. </summary>
-    public partial class LoadBalancerFrontendIPConfigurationsClient
+    public partial class LoadBalancerFrontendIPConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerFrontendIPConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsClient for mocking. </summary>
-        protected LoadBalancerFrontendIPConfigurationsClient()
+        internal LoadBalancerFrontendIPConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsOperations for mocking. </summary>
+        protected LoadBalancerFrontendIPConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerFrontendIPConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerFrontendIPConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerFrontendIPConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerFrontendIPConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerFrontendIPConfigurationsClient(ClientDiagnostics clientDiag
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FrontendIPConfiguration>> GetAsync(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<FrontendIPConfiguration>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FrontendIPConfiguration> Get(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<FrontendIPConfiguration> ListAsync(string resourceG
 
             async Task<Page<FrontendIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<FrontendIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FrontendIPConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<FrontendIPConfiguration> List(string resourceGroupName,
 
             Page<FrontendIPConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<FrontendIPConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<FrontendIPConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerFrontendIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsRestOperations.cs
index a0ec480c77dac..f360a669eadbc 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerFrontendIPConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancerFrontendIPConfigurationsRestClient
+    internal partial class LoadBalancerFrontendIPConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerFrontendIPConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerFrontendIPConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerFrontendIPConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesOperations.cs
similarity index 89%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesOperations.cs
index 73ef45ee287a7..d7021e3962f58 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancerLoadBalancingRules service client. </summary>
-    public partial class LoadBalancerLoadBalancingRulesClient
+    public partial class LoadBalancerLoadBalancingRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerLoadBalancingRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesClient for mocking. </summary>
-        protected LoadBalancerLoadBalancingRulesClient()
+        internal LoadBalancerLoadBalancingRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesOperations for mocking. </summary>
+        protected LoadBalancerLoadBalancingRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerLoadBalancingRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerLoadBalancingRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerLoadBalancingRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerLoadBalancingRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerLoadBalancingRulesClient(ClientDiagnostics clientDiagnostic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LoadBalancingRule>> GetAsync(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<LoadBalancingRule>> GetAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LoadBalancingRule> Get(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<LoadBalancingRule> ListAsync(string resourceGroupNa
 
             async Task<Page<LoadBalancingRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<LoadBalancingRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancingRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<LoadBalancingRule> List(string resourceGroupName, string
 
             Page<LoadBalancingRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<LoadBalancingRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancingRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerLoadBalancingRulesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesRestOperations.cs
index 46130ee5cc87e..c17537c26c239 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerLoadBalancingRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancerLoadBalancingRulesRestClient
+    internal partial class LoadBalancerLoadBalancingRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerLoadBalancingRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerLoadBalancingRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerLoadBalancingRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesOperations.cs
similarity index 87%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesOperations.cs
index 02bd97018c6c3..1f5edb70b3726 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancerNetworkInterfaces service client. </summary>
-    public partial class LoadBalancerNetworkInterfacesClient
+    public partial class LoadBalancerNetworkInterfacesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerNetworkInterfacesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesClient for mocking. </summary>
-        protected LoadBalancerNetworkInterfacesClient()
+        internal LoadBalancerNetworkInterfacesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesOperations for mocking. </summary>
+        protected LoadBalancerNetworkInterfacesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerNetworkInterfacesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerNetworkInterfacesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerNetworkInterfacesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerNetworkInterfacesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -54,7 +54,7 @@ public virtual AsyncPageable<NetworkInterface> ListAsync(string resourceGroupNam
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -69,7 +69,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ public virtual Pageable<NetworkInterface> List(string resourceGroupName, string
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -117,7 +117,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerNetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesRestOperations.cs
index c81d1d0b60634..50b7ed7bae07f 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerNetworkInterfacesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancerNetworkInterfacesRestClient
+    internal partial class LoadBalancerNetworkInterfacesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerNetworkInterfacesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerNetworkInterfacesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerNetworkInterfacesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesOperations.cs
index c2b134159a940..512d75b6b3385 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancerOutboundRules service client. </summary>
-    public partial class LoadBalancerOutboundRulesClient
+    public partial class LoadBalancerOutboundRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerOutboundRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesClient for mocking. </summary>
-        protected LoadBalancerOutboundRulesClient()
+        internal LoadBalancerOutboundRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesOperations for mocking. </summary>
+        protected LoadBalancerOutboundRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerOutboundRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerOutboundRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerOutboundRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerOutboundRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerOutboundRulesClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<OutboundRule>> GetAsync(string resourceGroupName, string loadBalancerName, string outboundRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<OutboundRule>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<OutboundRule> Get(string resourceGroupName, string loadBalancerName, string outboundRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<OutboundRule> ListAsync(string resourceGroupName, s
 
             async Task<Page<OutboundRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<OutboundRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<OutboundRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<OutboundRule> List(string resourceGroupName, string load
 
             Page<OutboundRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<OutboundRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<OutboundRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerOutboundRulesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesRestOperations.cs
index 3986182eeb06d..4b3119b8de77c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerOutboundRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancerOutboundRulesRestClient
+    internal partial class LoadBalancerOutboundRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerOutboundRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerOutboundRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerOutboundRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesOperations.cs
index 2cf20edf6cd25..06d0fe0dbce41 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancerProbes service client. </summary>
-    public partial class LoadBalancerProbesClient
+    public partial class LoadBalancerProbesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancerProbesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancerProbesClient for mocking. </summary>
-        protected LoadBalancerProbesClient()
+        internal LoadBalancerProbesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancerProbesOperations for mocking. </summary>
+        protected LoadBalancerProbesOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancerProbesClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerProbesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancerProbesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancerProbesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancerProbesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancerProbesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancerProbesClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Probe>> GetAsync(string resourceGroupName, string loadBalancerName, string probeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<Probe>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Probe> Get(string resourceGroupName, string loadBalancerName, string probeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<Probe> ListAsync(string resourceGroupName, string l
 
             async Task<Page<Probe>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<Probe>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Probe>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<Probe> List(string resourceGroupName, string loadBalance
 
             Page<Probe> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<Probe> FirstPageFunc(int? pageSizeHint)
             }
             Page<Probe> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancerProbesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesRestOperations.cs
index db54258bf0ef1..2d77a50335f47 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancerProbesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancerProbesRestClient
+    internal partial class LoadBalancerProbesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancerProbesRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancerProbesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancerProbesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancerProbesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersOperations.cs
index 4958852f67bdc..3b535a58c45ed 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LoadBalancers service client. </summary>
-    public partial class LoadBalancersClient
+    public partial class LoadBalancersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LoadBalancersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LoadBalancersClient for mocking. </summary>
-        protected LoadBalancersClient()
+        internal LoadBalancersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LoadBalancersOperations for mocking. </summary>
+        protected LoadBalancersOperations()
         {
         }
-        /// <summary> Initializes a new instance of LoadBalancersClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LoadBalancersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LoadBalancersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LoadBalancersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LoadBalancersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal LoadBalancersClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LoadBalancer>> GetAsync(string resourceGroupName, string loadBalancerName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<LoadBalancer>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LoadBalancer> Get(string resourceGroupName, string loadBalancerName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<LoadBalancer> Get(string resourceGroupName, string loadB
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LoadBalancer>> UpdateTagsAsync(string resourceGroupName, string loadBalancerName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<LoadBalancer>> UpdateTagsAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LoadBalancer> UpdateTags(string resourceGroupName, string loadBalancerName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<LoadBalancer> ListAllAsync(CancellationToken cancel
         {
             async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancer>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<LoadBalancer> ListAll(CancellationToken cancellationToke
         {
             Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancer> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<LoadBalancer> ListAsync(string resourceGroupName, C
 
             async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancer>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<LoadBalancer> List(string resourceGroupName, Cancellatio
 
             Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancer> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<LoadBalancersDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(loadBalancerName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual LoadBalancersDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(loadBalancerName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<LoadBalancersCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual LoadBalancersCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LoadBalancersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LoadBalancersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersRestOperations.cs
index 9a25d005aa124..6fdb1596ae607 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LoadBalancersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LoadBalancersRestClient
+    internal partial class LoadBalancersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LoadBalancersRestClient. </summary>
+        /// <summary> Initializes a new instance of LoadBalancersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LoadBalancersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LoadBalancersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysOperations.cs
index d9f0408c4d6fa..09a8fad34c73e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The LocalNetworkGateways service client. </summary>
-    public partial class LocalNetworkGatewaysClient
+    public partial class LocalNetworkGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal LocalNetworkGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of LocalNetworkGatewaysClient for mocking. </summary>
-        protected LocalNetworkGatewaysClient()
+        internal LocalNetworkGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of LocalNetworkGatewaysOperations for mocking. </summary>
+        protected LocalNetworkGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of LocalNetworkGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of LocalNetworkGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal LocalNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal LocalNetworkGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new LocalNetworkGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new LocalNetworkGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal LocalNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LocalNetworkGateway>> GetAsync(string resourceGroupName, string localNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<LocalNetworkGateway>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LocalNetworkGateway> Get(string resourceGroupName, string localNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<LocalNetworkGateway> Get(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LocalNetworkGateway>> UpdateTagsAsync(string resourceGroupName, string localNetworkGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<LocalNetworkGateway>> UpdateTagsAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LocalNetworkGateway> UpdateTags(string resourceGroupName, string localNetworkGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<LocalNetworkGateway> ListAsync(string resourceGroup
 
             async Task<Page<LocalNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<LocalNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LocalNetworkGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<LocalNetworkGateway> List(string resourceGroupName, Canc
 
             Page<LocalNetworkGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<LocalNetworkGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<LocalNetworkGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ public virtual async Task<LocalNetworkGatewaysCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -255,7 +255,7 @@ public virtual LocalNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -284,7 +284,7 @@ public virtual async Task<LocalNetworkGatewaysDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(localNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -313,7 +313,7 @@ public virtual LocalNetworkGatewaysDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(localNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("LocalNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysRestOperations.cs
index bc3c8e04102eb..fe24afd37aaf6 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/LocalNetworkGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class LocalNetworkGatewaysRestClient
+    internal partial class LocalNetworkGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of LocalNetworkGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of LocalNetworkGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public LocalNetworkGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public LocalNetworkGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysOperations.cs
index 85d8cab77b7e1..d085e06fe81c8 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NatGateways service client. </summary>
-    public partial class NatGatewaysClient
+    public partial class NatGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NatGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NatGatewaysClient for mocking. </summary>
-        protected NatGatewaysClient()
+        internal NatGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NatGatewaysOperations for mocking. </summary>
+        protected NatGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of NatGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of NatGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NatGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NatGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NatGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NatGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NatGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NatGateway>> GetAsync(string resourceGroupName, string natGatewayName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NatGateway>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NatGateway> Get(string resourceGroupName, string natGatewayName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NatGateway> Get(string resourceGroupName, string natGate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NatGateway>> UpdateTagsAsync(string resourceGroupName, string natGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NatGateway>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NatGateway> UpdateTags(string resourceGroupName, string natGatewayName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<NatGateway> ListAllAsync(CancellationToken cancella
         {
             async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NatGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<NatGateway> ListAll(CancellationToken cancellationToken
         {
             Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<NatGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<NatGateway> ListAsync(string resourceGroupName, Can
 
             async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<NatGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NatGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<NatGateway> List(string resourceGroupName, CancellationT
 
             Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<NatGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<NatGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<NatGatewaysDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(natGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual NatGatewaysDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(natGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<NatGatewaysCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual NatGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NatGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NatGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysRestOperations.cs
index eb6925a91a4f2..e4ef57c7d896c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NatGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NatGatewaysRestClient
+    internal partial class NatGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NatGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of NatGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NatGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NatGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsOperations.cs
index 5d24deb8d9d36..aecee3d2125c5 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkInterfaceIPConfigurations service client. </summary>
-    public partial class NetworkInterfaceIPConfigurationsClient
+    public partial class NetworkInterfaceIPConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfaceIPConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsClient for mocking. </summary>
-        protected NetworkInterfaceIPConfigurationsClient()
+        internal NetworkInterfaceIPConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsOperations for mocking. </summary>
+        protected NetworkInterfaceIPConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfaceIPConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfaceIPConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfaceIPConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfaceIPConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkInterfaceIPConfigurationsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterfaceIPConfiguration> Get(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<NetworkInterfaceIPConfiguration> ListAsync(string r
 
             async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<NetworkInterfaceIPConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<NetworkInterfaceIPConfiguration> List(string resourceGro
 
             Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterfaceIPConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceIPConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsRestOperations.cs
index 6f95452dfe22e..a642e4d3cf5e7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceIPConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkInterfaceIPConfigurationsRestClient
+    internal partial class NetworkInterfaceIPConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceIPConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfaceIPConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfaceIPConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersOperations.cs
similarity index 87%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersOperations.cs
index 442fad1f918c1..9d65fe0d6888b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkInterfaceLoadBalancers service client. </summary>
-    public partial class NetworkInterfaceLoadBalancersClient
+    public partial class NetworkInterfaceLoadBalancersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfaceLoadBalancersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersClient for mocking. </summary>
-        protected NetworkInterfaceLoadBalancersClient()
+        internal NetworkInterfaceLoadBalancersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersOperations for mocking. </summary>
+        protected NetworkInterfaceLoadBalancersOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfaceLoadBalancersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfaceLoadBalancersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfaceLoadBalancersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfaceLoadBalancersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -54,7 +54,7 @@ public virtual AsyncPageable<LoadBalancer> ListAsync(string resourceGroupName, s
 
             async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -69,7 +69,7 @@ async Task<Page<LoadBalancer>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<LoadBalancer>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -102,7 +102,7 @@ public virtual Pageable<LoadBalancer> List(string resourceGroupName, string netw
 
             Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
@@ -117,7 +117,7 @@ Page<LoadBalancer> FirstPageFunc(int? pageSizeHint)
             }
             Page<LoadBalancer> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceLoadBalancersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersRestOperations.cs
index 4376eedf933d2..ec0f909b301ad 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceLoadBalancersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkInterfaceLoadBalancersRestClient
+    internal partial class NetworkInterfaceLoadBalancersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceLoadBalancersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfaceLoadBalancersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfaceLoadBalancersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsOperations.cs
index 65050e3f3bc63..ebad236298a0b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkInterfaceTapConfigurations service client. </summary>
-    public partial class NetworkInterfaceTapConfigurationsClient
+    public partial class NetworkInterfaceTapConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfaceTapConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsClient for mocking. </summary>
-        protected NetworkInterfaceTapConfigurationsClient()
+        internal NetworkInterfaceTapConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsOperations for mocking. </summary>
+        protected NetworkInterfaceTapConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfaceTapConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfaceTapConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfaceTapConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfaceTapConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkInterfaceTapConfigurationsClient(ClientDiagnostics clientDiagnos
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterfaceTapConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkInterfaceTapConfiguration>> GetAsync(s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterfaceTapConfiguration> Get(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<NetworkInterfaceTapConfiguration> ListAsync(string
 
             async Task<Page<NetworkInterfaceTapConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<NetworkInterfaceTapConfiguration>> FirstPageFunc(int? pageSizeHi
             }
             async Task<Page<NetworkInterfaceTapConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<NetworkInterfaceTapConfiguration> List(string resourceGr
 
             Page<NetworkInterfaceTapConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<NetworkInterfaceTapConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterfaceTapConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<NetworkInterfaceTapConfigurationsDeleteOperation> Star
                 throw new ArgumentNullException(nameof(tapConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual NetworkInterfaceTapConfigurationsDeleteOperation StartDelete(stri
                 throw new ArgumentNullException(nameof(tapConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<NetworkInterfaceTapConfigurationsCreateOrUpdateOperati
                 throw new ArgumentNullException(nameof(tapConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual NetworkInterfaceTapConfigurationsCreateOrUpdateOperation StartCre
                 throw new ArgumentNullException(nameof(tapConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfaceTapConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsRestOperations.cs
index 6146d93377442..f783e9adac1dc 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfaceTapConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkInterfaceTapConfigurationsRestClient
+    internal partial class NetworkInterfaceTapConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfaceTapConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfaceTapConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfaceTapConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesOperations.cs
index 94b86c97fb145..9055cb066b022 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkInterfaces service client. </summary>
-    public partial class NetworkInterfacesClient
+    public partial class NetworkInterfacesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkInterfacesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkInterfacesClient for mocking. </summary>
-        protected NetworkInterfacesClient()
+        internal NetworkInterfacesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkInterfacesOperations for mocking. </summary>
+        protected NetworkInterfacesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkInterfacesClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfacesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkInterfacesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkInterfacesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkInterfacesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkInterfacesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkInterfacesClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterface>> GetAsync(string resourceGroupName, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkInterface>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterface> Get(string resourceGroupName, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkInterface> Get(string resourceGroupName, string n
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterface>> UpdateTagsAsync(string resourceGroupName, string networkInterfaceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkInterface>> UpdateTagsAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterface> UpdateTags(string resourceGroupName, string networkInterfaceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -126,7 +126,7 @@ public virtual Response<NetworkInterface> UpdateTags(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterface>> GetVirtualMachineScaleSetNetworkInterfaceAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetNetworkInterface");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetNetworkInterface");
             scope.Start();
             try
             {
@@ -148,7 +148,7 @@ public virtual async Task<Response<NetworkInterface>> GetVirtualMachineScaleSetN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterface> GetVirtualMachineScaleSetNetworkInterface(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetNetworkInterface");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetNetworkInterface");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual Response<NetworkInterface> GetVirtualMachineScaleSetNetworkInterf
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetVirtualMachineScaleSetIpConfigurationAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetIpConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetIpConfiguration");
             scope.Start();
             try
             {
@@ -194,7 +194,7 @@ public virtual async Task<Response<NetworkInterfaceIPConfiguration>> GetVirtualM
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkInterfaceIPConfiguration> GetVirtualMachineScaleSetIpConfiguration(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.GetVirtualMachineScaleSetIpConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.GetVirtualMachineScaleSetIpConfiguration");
             scope.Start();
             try
             {
@@ -213,7 +213,7 @@ public virtual AsyncPageable<NetworkInterface> ListAllAsync(CancellationToken ca
         {
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -228,7 +228,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -250,7 +250,7 @@ public virtual Pageable<NetworkInterface> ListAll(CancellationToken cancellation
         {
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -265,7 +265,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -293,7 +293,7 @@ public virtual AsyncPageable<NetworkInterface> ListAsync(string resourceGroupNam
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -308,7 +308,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -336,7 +336,7 @@ public virtual Pageable<NetworkInterface> List(string resourceGroupName, Cancell
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -351,7 +351,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.List");
                 scope.Start();
                 try
                 {
@@ -389,7 +389,7 @@ public virtual AsyncPageable<NetworkInterface> ListVirtualMachineScaleSetVMNetwo
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -404,7 +404,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -442,7 +442,7 @@ public virtual Pageable<NetworkInterface> ListVirtualMachineScaleSetVMNetworkInt
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -457,7 +457,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetVMNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetVMNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -490,7 +490,7 @@ public virtual AsyncPageable<NetworkInterface> ListVirtualMachineScaleSetNetwork
 
             async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -505,7 +505,7 @@ async Task<Page<NetworkInterface>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkInterface>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -538,7 +538,7 @@ public virtual Pageable<NetworkInterface> ListVirtualMachineScaleSetNetworkInter
 
             Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -553,7 +553,7 @@ Page<NetworkInterface> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterface> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetNetworkInterfaces");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetNetworkInterfaces");
                 scope.Start();
                 try
                 {
@@ -597,7 +597,7 @@ public virtual AsyncPageable<NetworkInterfaceIPConfiguration> ListVirtualMachine
 
             async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -612,7 +612,7 @@ async Task<Page<NetworkInterfaceIPConfiguration>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<NetworkInterfaceIPConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -656,7 +656,7 @@ public virtual Pageable<NetworkInterfaceIPConfiguration> ListVirtualMachineScale
 
             Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -671,7 +671,7 @@ Page<NetworkInterfaceIPConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkInterfaceIPConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.ListVirtualMachineScaleSetIpConfigurations");
+                using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.ListVirtualMachineScaleSetIpConfigurations");
                 scope.Start();
                 try
                 {
@@ -702,7 +702,7 @@ public virtual async Task<NetworkInterfacesDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -731,7 +731,7 @@ public virtual NetworkInterfacesDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -765,7 +765,7 @@ public virtual async Task<NetworkInterfacesCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -799,7 +799,7 @@ public virtual NetworkInterfacesCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -828,7 +828,7 @@ public virtual async Task<NetworkInterfacesGetEffectiveRouteTableOperation> Star
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartGetEffectiveRouteTable");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartGetEffectiveRouteTable");
             scope.Start();
             try
             {
@@ -857,7 +857,7 @@ public virtual NetworkInterfacesGetEffectiveRouteTableOperation StartGetEffectiv
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartGetEffectiveRouteTable");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartGetEffectiveRouteTable");
             scope.Start();
             try
             {
@@ -886,7 +886,7 @@ public virtual async Task<NetworkInterfacesListEffectiveNetworkSecurityGroupsOpe
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartListEffectiveNetworkSecurityGroups");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartListEffectiveNetworkSecurityGroups");
             scope.Start();
             try
             {
@@ -915,7 +915,7 @@ public virtual NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation Star
                 throw new ArgumentNullException(nameof(networkInterfaceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesClient.StartListEffectiveNetworkSecurityGroups");
+            using var scope = _clientDiagnostics.CreateScope("NetworkInterfacesOperations.StartListEffectiveNetworkSecurityGroups");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesRestOperations.cs
index 353985336cd12..c7257505b425a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkInterfacesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkInterfacesRestClient
+    internal partial class NetworkInterfacesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkInterfacesRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkInterfacesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkInterfacesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkInterfacesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkManagementClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkManagementClient.cs
index 2e380f4faa2bd..d672fc9b4fd1f 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkManagementClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkManagementClient.cs
@@ -53,574 +53,289 @@ public NetworkManagementClient(string subscriptionId, Uri endpoint, TokenCredent
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of ApplicationGatewaysClient. </summary>
-        public virtual ApplicationGatewaysClient GetApplicationGatewaysClient()
-        {
-            return new ApplicationGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationGatewaysOperations. </summary>
+        public virtual ApplicationGatewaysOperations ApplicationGateways => new ApplicationGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ApplicationSecurityGroupsClient. </summary>
-        public virtual ApplicationSecurityGroupsClient GetApplicationSecurityGroupsClient()
-        {
-            return new ApplicationSecurityGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ApplicationSecurityGroupsOperations. </summary>
+        public virtual ApplicationSecurityGroupsOperations ApplicationSecurityGroups => new ApplicationSecurityGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableDelegationsClient. </summary>
-        public virtual AvailableDelegationsClient GetAvailableDelegationsClient()
-        {
-            return new AvailableDelegationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableDelegationsOperations. </summary>
+        public virtual AvailableDelegationsOperations AvailableDelegations => new AvailableDelegationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableResourceGroupDelegationsClient. </summary>
-        public virtual AvailableResourceGroupDelegationsClient GetAvailableResourceGroupDelegationsClient()
-        {
-            return new AvailableResourceGroupDelegationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableResourceGroupDelegationsOperations. </summary>
+        public virtual AvailableResourceGroupDelegationsOperations AvailableResourceGroupDelegations => new AvailableResourceGroupDelegationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableServiceAliasesClient. </summary>
-        public virtual AvailableServiceAliasesClient GetAvailableServiceAliasesClient()
-        {
-            return new AvailableServiceAliasesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableServiceAliasesOperations. </summary>
+        public virtual AvailableServiceAliasesOperations AvailableServiceAliases => new AvailableServiceAliasesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AzureFirewallsClient. </summary>
-        public virtual AzureFirewallsClient GetAzureFirewallsClient()
-        {
-            return new AzureFirewallsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AzureFirewallsOperations. </summary>
+        public virtual AzureFirewallsOperations AzureFirewalls => new AzureFirewallsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AzureFirewallFqdnTagsClient. </summary>
-        public virtual AzureFirewallFqdnTagsClient GetAzureFirewallFqdnTagsClient()
-        {
-            return new AzureFirewallFqdnTagsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AzureFirewallFqdnTagsOperations. </summary>
+        public virtual AzureFirewallFqdnTagsOperations AzureFirewallFqdnTags => new AzureFirewallFqdnTagsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BastionHostsClient. </summary>
-        public virtual BastionHostsClient GetBastionHostsClient()
-        {
-            return new BastionHostsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BastionHostsOperations. </summary>
+        public virtual BastionHostsOperations BastionHosts => new BastionHostsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceClient. </summary>
-        public virtual ServiceClient GetServiceClient()
-        {
-            return new ServiceClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceOperations. </summary>
+        public virtual ServiceOperations Service => new ServiceOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DdosCustomPoliciesClient. </summary>
-        public virtual DdosCustomPoliciesClient GetDdosCustomPoliciesClient()
-        {
-            return new DdosCustomPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DdosCustomPoliciesOperations. </summary>
+        public virtual DdosCustomPoliciesOperations DdosCustomPolicies => new DdosCustomPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DdosProtectionPlansClient. </summary>
-        public virtual DdosProtectionPlansClient GetDdosProtectionPlansClient()
-        {
-            return new DdosProtectionPlansClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DdosProtectionPlansOperations. </summary>
+        public virtual DdosProtectionPlansOperations DdosProtectionPlans => new DdosProtectionPlansOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailableEndpointServicesClient. </summary>
-        public virtual AvailableEndpointServicesClient GetAvailableEndpointServicesClient()
-        {
-            return new AvailableEndpointServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailableEndpointServicesOperations. </summary>
+        public virtual AvailableEndpointServicesOperations AvailableEndpointServices => new AvailableEndpointServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitAuthorizationsClient. </summary>
-        public virtual ExpressRouteCircuitAuthorizationsClient GetExpressRouteCircuitAuthorizationsClient()
-        {
-            return new ExpressRouteCircuitAuthorizationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitAuthorizationsOperations. </summary>
+        public virtual ExpressRouteCircuitAuthorizationsOperations ExpressRouteCircuitAuthorizations => new ExpressRouteCircuitAuthorizationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitPeeringsClient. </summary>
-        public virtual ExpressRouteCircuitPeeringsClient GetExpressRouteCircuitPeeringsClient()
-        {
-            return new ExpressRouteCircuitPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitPeeringsOperations. </summary>
+        public virtual ExpressRouteCircuitPeeringsOperations ExpressRouteCircuitPeerings => new ExpressRouteCircuitPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitConnectionsClient. </summary>
-        public virtual ExpressRouteCircuitConnectionsClient GetExpressRouteCircuitConnectionsClient()
-        {
-            return new ExpressRouteCircuitConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitConnectionsOperations. </summary>
+        public virtual ExpressRouteCircuitConnectionsOperations ExpressRouteCircuitConnections => new ExpressRouteCircuitConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PeerExpressRouteCircuitConnectionsClient. </summary>
-        public virtual PeerExpressRouteCircuitConnectionsClient GetPeerExpressRouteCircuitConnectionsClient()
-        {
-            return new PeerExpressRouteCircuitConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PeerExpressRouteCircuitConnectionsOperations. </summary>
+        public virtual PeerExpressRouteCircuitConnectionsOperations PeerExpressRouteCircuitConnections => new PeerExpressRouteCircuitConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCircuitsClient. </summary>
-        public virtual ExpressRouteCircuitsClient GetExpressRouteCircuitsClient()
-        {
-            return new ExpressRouteCircuitsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCircuitsOperations. </summary>
+        public virtual ExpressRouteCircuitsOperations ExpressRouteCircuits => new ExpressRouteCircuitsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteServiceProvidersClient. </summary>
-        public virtual ExpressRouteServiceProvidersClient GetExpressRouteServiceProvidersClient()
-        {
-            return new ExpressRouteServiceProvidersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteServiceProvidersOperations. </summary>
+        public virtual ExpressRouteServiceProvidersOperations ExpressRouteServiceProviders => new ExpressRouteServiceProvidersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCrossConnectionsClient. </summary>
-        public virtual ExpressRouteCrossConnectionsClient GetExpressRouteCrossConnectionsClient()
-        {
-            return new ExpressRouteCrossConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCrossConnectionsOperations. </summary>
+        public virtual ExpressRouteCrossConnectionsOperations ExpressRouteCrossConnections => new ExpressRouteCrossConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteCrossConnectionPeeringsClient. </summary>
-        public virtual ExpressRouteCrossConnectionPeeringsClient GetExpressRouteCrossConnectionPeeringsClient()
-        {
-            return new ExpressRouteCrossConnectionPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteCrossConnectionPeeringsOperations. </summary>
+        public virtual ExpressRouteCrossConnectionPeeringsOperations ExpressRouteCrossConnectionPeerings => new ExpressRouteCrossConnectionPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRoutePortsLocationsClient. </summary>
-        public virtual ExpressRoutePortsLocationsClient GetExpressRoutePortsLocationsClient()
-        {
-            return new ExpressRoutePortsLocationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRoutePortsLocationsOperations. </summary>
+        public virtual ExpressRoutePortsLocationsOperations ExpressRoutePortsLocations => new ExpressRoutePortsLocationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRoutePortsClient. </summary>
-        public virtual ExpressRoutePortsClient GetExpressRoutePortsClient()
-        {
-            return new ExpressRoutePortsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRoutePortsOperations. </summary>
+        public virtual ExpressRoutePortsOperations ExpressRoutePorts => new ExpressRoutePortsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteLinksClient. </summary>
-        public virtual ExpressRouteLinksClient GetExpressRouteLinksClient()
-        {
-            return new ExpressRouteLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteLinksOperations. </summary>
+        public virtual ExpressRouteLinksOperations ExpressRouteLinks => new ExpressRouteLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FirewallPoliciesClient. </summary>
-        public virtual FirewallPoliciesClient GetFirewallPoliciesClient()
-        {
-            return new FirewallPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FirewallPoliciesOperations. </summary>
+        public virtual FirewallPoliciesOperations FirewallPolicies => new FirewallPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FirewallPolicyRuleGroupsClient. </summary>
-        public virtual FirewallPolicyRuleGroupsClient GetFirewallPolicyRuleGroupsClient()
-        {
-            return new FirewallPolicyRuleGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FirewallPolicyRuleGroupsOperations. </summary>
+        public virtual FirewallPolicyRuleGroupsOperations FirewallPolicyRuleGroups => new FirewallPolicyRuleGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of IpAllocationsClient. </summary>
-        public virtual IpAllocationsClient GetIpAllocationsClient()
-        {
-            return new IpAllocationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of IpAllocationsOperations. </summary>
+        public virtual IpAllocationsOperations IpAllocations => new IpAllocationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of IpGroupsClient. </summary>
-        public virtual IpGroupsClient GetIpGroupsClient()
-        {
-            return new IpGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of IpGroupsOperations. </summary>
+        public virtual IpGroupsOperations IpGroups => new IpGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancersClient. </summary>
-        public virtual LoadBalancersClient GetLoadBalancersClient()
-        {
-            return new LoadBalancersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancersOperations. </summary>
+        public virtual LoadBalancersOperations LoadBalancers => new LoadBalancersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerBackendAddressPoolsClient. </summary>
-        public virtual LoadBalancerBackendAddressPoolsClient GetLoadBalancerBackendAddressPoolsClient()
-        {
-            return new LoadBalancerBackendAddressPoolsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerBackendAddressPoolsOperations. </summary>
+        public virtual LoadBalancerBackendAddressPoolsOperations LoadBalancerBackendAddressPools => new LoadBalancerBackendAddressPoolsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerFrontendIPConfigurationsClient. </summary>
-        public virtual LoadBalancerFrontendIPConfigurationsClient GetLoadBalancerFrontendIPConfigurationsClient()
-        {
-            return new LoadBalancerFrontendIPConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerFrontendIPConfigurationsOperations. </summary>
+        public virtual LoadBalancerFrontendIPConfigurationsOperations LoadBalancerFrontendIPConfigurations => new LoadBalancerFrontendIPConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of InboundNatRulesClient. </summary>
-        public virtual InboundNatRulesClient GetInboundNatRulesClient()
-        {
-            return new InboundNatRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of InboundNatRulesOperations. </summary>
+        public virtual InboundNatRulesOperations InboundNatRules => new InboundNatRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerLoadBalancingRulesClient. </summary>
-        public virtual LoadBalancerLoadBalancingRulesClient GetLoadBalancerLoadBalancingRulesClient()
-        {
-            return new LoadBalancerLoadBalancingRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerLoadBalancingRulesOperations. </summary>
+        public virtual LoadBalancerLoadBalancingRulesOperations LoadBalancerLoadBalancingRules => new LoadBalancerLoadBalancingRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerOutboundRulesClient. </summary>
-        public virtual LoadBalancerOutboundRulesClient GetLoadBalancerOutboundRulesClient()
-        {
-            return new LoadBalancerOutboundRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerOutboundRulesOperations. </summary>
+        public virtual LoadBalancerOutboundRulesOperations LoadBalancerOutboundRules => new LoadBalancerOutboundRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerNetworkInterfacesClient. </summary>
-        public virtual LoadBalancerNetworkInterfacesClient GetLoadBalancerNetworkInterfacesClient()
-        {
-            return new LoadBalancerNetworkInterfacesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerNetworkInterfacesOperations. </summary>
+        public virtual LoadBalancerNetworkInterfacesOperations LoadBalancerNetworkInterfaces => new LoadBalancerNetworkInterfacesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LoadBalancerProbesClient. </summary>
-        public virtual LoadBalancerProbesClient GetLoadBalancerProbesClient()
-        {
-            return new LoadBalancerProbesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LoadBalancerProbesOperations. </summary>
+        public virtual LoadBalancerProbesOperations LoadBalancerProbes => new LoadBalancerProbesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NatGatewaysClient. </summary>
-        public virtual NatGatewaysClient GetNatGatewaysClient()
-        {
-            return new NatGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NatGatewaysOperations. </summary>
+        public virtual NatGatewaysOperations NatGateways => new NatGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfacesClient. </summary>
-        public virtual NetworkInterfacesClient GetNetworkInterfacesClient()
-        {
-            return new NetworkInterfacesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfacesOperations. </summary>
+        public virtual NetworkInterfacesOperations NetworkInterfaces => new NetworkInterfacesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfaceIPConfigurationsClient. </summary>
-        public virtual NetworkInterfaceIPConfigurationsClient GetNetworkInterfaceIPConfigurationsClient()
-        {
-            return new NetworkInterfaceIPConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfaceIPConfigurationsOperations. </summary>
+        public virtual NetworkInterfaceIPConfigurationsOperations NetworkInterfaceIPConfigurations => new NetworkInterfaceIPConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfaceLoadBalancersClient. </summary>
-        public virtual NetworkInterfaceLoadBalancersClient GetNetworkInterfaceLoadBalancersClient()
-        {
-            return new NetworkInterfaceLoadBalancersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfaceLoadBalancersOperations. </summary>
+        public virtual NetworkInterfaceLoadBalancersOperations NetworkInterfaceLoadBalancers => new NetworkInterfaceLoadBalancersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkInterfaceTapConfigurationsClient. </summary>
-        public virtual NetworkInterfaceTapConfigurationsClient GetNetworkInterfaceTapConfigurationsClient()
-        {
-            return new NetworkInterfaceTapConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkInterfaceTapConfigurationsOperations. </summary>
+        public virtual NetworkInterfaceTapConfigurationsOperations NetworkInterfaceTapConfigurations => new NetworkInterfaceTapConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkProfilesClient. </summary>
-        public virtual NetworkProfilesClient GetNetworkProfilesClient()
-        {
-            return new NetworkProfilesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkProfilesOperations. </summary>
+        public virtual NetworkProfilesOperations NetworkProfiles => new NetworkProfilesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkSecurityGroupsClient. </summary>
-        public virtual NetworkSecurityGroupsClient GetNetworkSecurityGroupsClient()
-        {
-            return new NetworkSecurityGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkSecurityGroupsOperations. </summary>
+        public virtual NetworkSecurityGroupsOperations NetworkSecurityGroups => new NetworkSecurityGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SecurityRulesClient. </summary>
-        public virtual SecurityRulesClient GetSecurityRulesClient()
-        {
-            return new SecurityRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SecurityRulesOperations. </summary>
+        public virtual SecurityRulesOperations SecurityRules => new SecurityRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DefaultSecurityRulesClient. </summary>
-        public virtual DefaultSecurityRulesClient GetDefaultSecurityRulesClient()
-        {
-            return new DefaultSecurityRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DefaultSecurityRulesOperations. </summary>
+        public virtual DefaultSecurityRulesOperations DefaultSecurityRules => new DefaultSecurityRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkVirtualAppliancesClient. </summary>
-        public virtual NetworkVirtualAppliancesClient GetNetworkVirtualAppliancesClient()
-        {
-            return new NetworkVirtualAppliancesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkVirtualAppliancesOperations. </summary>
+        public virtual NetworkVirtualAppliancesOperations NetworkVirtualAppliances => new NetworkVirtualAppliancesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of NetworkWatchersClient. </summary>
-        public virtual NetworkWatchersClient GetNetworkWatchersClient()
-        {
-            return new NetworkWatchersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of NetworkWatchersOperations. </summary>
+        public virtual NetworkWatchersOperations NetworkWatchers => new NetworkWatchersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PacketCapturesClient. </summary>
-        public virtual PacketCapturesClient GetPacketCapturesClient()
-        {
-            return new PacketCapturesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PacketCapturesOperations. </summary>
+        public virtual PacketCapturesOperations PacketCaptures => new PacketCapturesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ConnectionMonitorsClient. </summary>
-        public virtual ConnectionMonitorsClient GetConnectionMonitorsClient()
-        {
-            return new ConnectionMonitorsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ConnectionMonitorsOperations. </summary>
+        public virtual ConnectionMonitorsOperations ConnectionMonitors => new ConnectionMonitorsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FlowLogsClient. </summary>
-        public virtual FlowLogsClient GetFlowLogsClient()
-        {
-            return new FlowLogsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FlowLogsOperations. </summary>
+        public virtual FlowLogsOperations FlowLogs => new FlowLogsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateEndpointsClient. </summary>
-        public virtual PrivateEndpointsClient GetPrivateEndpointsClient()
-        {
-            return new PrivateEndpointsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateEndpointsOperations. </summary>
+        public virtual PrivateEndpointsOperations PrivateEndpoints => new PrivateEndpointsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of AvailablePrivateEndpointTypesClient. </summary>
-        public virtual AvailablePrivateEndpointTypesClient GetAvailablePrivateEndpointTypesClient()
-        {
-            return new AvailablePrivateEndpointTypesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of AvailablePrivateEndpointTypesOperations. </summary>
+        public virtual AvailablePrivateEndpointTypesOperations AvailablePrivateEndpointTypes => new AvailablePrivateEndpointTypesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateDnsZoneGroupsClient. </summary>
-        public virtual PrivateDnsZoneGroupsClient GetPrivateDnsZoneGroupsClient()
-        {
-            return new PrivateDnsZoneGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateDnsZoneGroupsOperations. </summary>
+        public virtual PrivateDnsZoneGroupsOperations PrivateDnsZoneGroups => new PrivateDnsZoneGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateLinkServicesClient. </summary>
-        public virtual PrivateLinkServicesClient GetPrivateLinkServicesClient()
-        {
-            return new PrivateLinkServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateLinkServicesOperations. </summary>
+        public virtual PrivateLinkServicesOperations PrivateLinkServices => new PrivateLinkServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PublicIPAddressesClient. </summary>
-        public virtual PublicIPAddressesClient GetPublicIPAddressesClient()
-        {
-            return new PublicIPAddressesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PublicIPAddressesOperations. </summary>
+        public virtual PublicIPAddressesOperations PublicIPAddresses => new PublicIPAddressesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PublicIPPrefixesClient. </summary>
-        public virtual PublicIPPrefixesClient GetPublicIPPrefixesClient()
-        {
-            return new PublicIPPrefixesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PublicIPPrefixesOperations. </summary>
+        public virtual PublicIPPrefixesOperations PublicIPPrefixes => new PublicIPPrefixesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RouteFiltersClient. </summary>
-        public virtual RouteFiltersClient GetRouteFiltersClient()
-        {
-            return new RouteFiltersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RouteFiltersOperations. </summary>
+        public virtual RouteFiltersOperations RouteFilters => new RouteFiltersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RouteFilterRulesClient. </summary>
-        public virtual RouteFilterRulesClient GetRouteFilterRulesClient()
-        {
-            return new RouteFilterRulesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RouteFilterRulesOperations. </summary>
+        public virtual RouteFilterRulesOperations RouteFilterRules => new RouteFilterRulesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RouteTablesClient. </summary>
-        public virtual RouteTablesClient GetRouteTablesClient()
-        {
-            return new RouteTablesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RouteTablesOperations. </summary>
+        public virtual RouteTablesOperations RouteTables => new RouteTablesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of RoutesClient. </summary>
-        public virtual RoutesClient GetRoutesClient()
-        {
-            return new RoutesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of RoutesOperations. </summary>
+        public virtual RoutesOperations Routes => new RoutesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SecurityPartnerProvidersClient. </summary>
-        public virtual SecurityPartnerProvidersClient GetSecurityPartnerProvidersClient()
-        {
-            return new SecurityPartnerProvidersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SecurityPartnerProvidersOperations. </summary>
+        public virtual SecurityPartnerProvidersOperations SecurityPartnerProviders => new SecurityPartnerProvidersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BgpServiceCommunitiesClient. </summary>
-        public virtual BgpServiceCommunitiesClient GetBgpServiceCommunitiesClient()
-        {
-            return new BgpServiceCommunitiesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BgpServiceCommunitiesOperations. </summary>
+        public virtual BgpServiceCommunitiesOperations BgpServiceCommunities => new BgpServiceCommunitiesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceEndpointPoliciesClient. </summary>
-        public virtual ServiceEndpointPoliciesClient GetServiceEndpointPoliciesClient()
-        {
-            return new ServiceEndpointPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceEndpointPoliciesOperations. </summary>
+        public virtual ServiceEndpointPoliciesOperations ServiceEndpointPolicies => new ServiceEndpointPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceEndpointPolicyDefinitionsClient. </summary>
-        public virtual ServiceEndpointPolicyDefinitionsClient GetServiceEndpointPolicyDefinitionsClient()
-        {
-            return new ServiceEndpointPolicyDefinitionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceEndpointPolicyDefinitionsOperations. </summary>
+        public virtual ServiceEndpointPolicyDefinitionsOperations ServiceEndpointPolicyDefinitions => new ServiceEndpointPolicyDefinitionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceTagsClient. </summary>
-        public virtual ServiceTagsClient GetServiceTagsClient()
-        {
-            return new ServiceTagsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceTagsOperations. </summary>
+        public virtual ServiceTagsOperations ServiceTags => new ServiceTagsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of UsagesClient. </summary>
-        public virtual UsagesClient GetUsagesClient()
-        {
-            return new UsagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of UsagesOperations. </summary>
+        public virtual UsagesOperations Usages => new UsagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworksClient. </summary>
-        public virtual VirtualNetworksClient GetVirtualNetworksClient()
-        {
-            return new VirtualNetworksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworksOperations. </summary>
+        public virtual VirtualNetworksOperations VirtualNetworks => new VirtualNetworksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of SubnetsClient. </summary>
-        public virtual SubnetsClient GetSubnetsClient()
-        {
-            return new SubnetsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SubnetsOperations. </summary>
+        public virtual SubnetsOperations Subnets => new SubnetsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceNavigationLinksClient. </summary>
-        public virtual ResourceNavigationLinksClient GetResourceNavigationLinksClient()
-        {
-            return new ResourceNavigationLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceNavigationLinksOperations. </summary>
+        public virtual ResourceNavigationLinksOperations ResourceNavigationLinks => new ResourceNavigationLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ServiceAssociationLinksClient. </summary>
-        public virtual ServiceAssociationLinksClient GetServiceAssociationLinksClient()
-        {
-            return new ServiceAssociationLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ServiceAssociationLinksOperations. </summary>
+        public virtual ServiceAssociationLinksOperations ServiceAssociationLinks => new ServiceAssociationLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkPeeringsClient. </summary>
-        public virtual VirtualNetworkPeeringsClient GetVirtualNetworkPeeringsClient()
-        {
-            return new VirtualNetworkPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkPeeringsOperations. </summary>
+        public virtual VirtualNetworkPeeringsOperations VirtualNetworkPeerings => new VirtualNetworkPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkGatewaysClient. </summary>
-        public virtual VirtualNetworkGatewaysClient GetVirtualNetworkGatewaysClient()
-        {
-            return new VirtualNetworkGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkGatewaysOperations. </summary>
+        public virtual VirtualNetworkGatewaysOperations VirtualNetworkGateways => new VirtualNetworkGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkGatewayConnectionsClient. </summary>
-        public virtual VirtualNetworkGatewayConnectionsClient GetVirtualNetworkGatewayConnectionsClient()
-        {
-            return new VirtualNetworkGatewayConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkGatewayConnectionsOperations. </summary>
+        public virtual VirtualNetworkGatewayConnectionsOperations VirtualNetworkGatewayConnections => new VirtualNetworkGatewayConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of LocalNetworkGatewaysClient. </summary>
-        public virtual LocalNetworkGatewaysClient GetLocalNetworkGatewaysClient()
-        {
-            return new LocalNetworkGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of LocalNetworkGatewaysOperations. </summary>
+        public virtual LocalNetworkGatewaysOperations LocalNetworkGateways => new LocalNetworkGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualNetworkTapsClient. </summary>
-        public virtual VirtualNetworkTapsClient GetVirtualNetworkTapsClient()
-        {
-            return new VirtualNetworkTapsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualNetworkTapsOperations. </summary>
+        public virtual VirtualNetworkTapsOperations VirtualNetworkTaps => new VirtualNetworkTapsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualRoutersClient. </summary>
-        public virtual VirtualRoutersClient GetVirtualRoutersClient()
-        {
-            return new VirtualRoutersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualRoutersOperations. </summary>
+        public virtual VirtualRoutersOperations VirtualRouters => new VirtualRoutersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualRouterPeeringsClient. </summary>
-        public virtual VirtualRouterPeeringsClient GetVirtualRouterPeeringsClient()
-        {
-            return new VirtualRouterPeeringsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualRouterPeeringsOperations. </summary>
+        public virtual VirtualRouterPeeringsOperations VirtualRouterPeerings => new VirtualRouterPeeringsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualWansClient. </summary>
-        public virtual VirtualWansClient GetVirtualWansClient()
-        {
-            return new VirtualWansClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualWansOperations. </summary>
+        public virtual VirtualWansOperations VirtualWans => new VirtualWansOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSitesClient. </summary>
-        public virtual VpnSitesClient GetVpnSitesClient()
-        {
-            return new VpnSitesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSitesOperations. </summary>
+        public virtual VpnSitesOperations VpnSites => new VpnSitesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSiteLinksClient. </summary>
-        public virtual VpnSiteLinksClient GetVpnSiteLinksClient()
-        {
-            return new VpnSiteLinksClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSiteLinksOperations. </summary>
+        public virtual VpnSiteLinksOperations VpnSiteLinks => new VpnSiteLinksOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSitesConfigurationClient. </summary>
-        public virtual VpnSitesConfigurationClient GetVpnSitesConfigurationClient()
-        {
-            return new VpnSitesConfigurationClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSitesConfigurationOperations. </summary>
+        public virtual VpnSitesConfigurationOperations VpnSitesConfiguration => new VpnSitesConfigurationOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnServerConfigurationsClient. </summary>
-        public virtual VpnServerConfigurationsClient GetVpnServerConfigurationsClient()
-        {
-            return new VpnServerConfigurationsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnServerConfigurationsOperations. </summary>
+        public virtual VpnServerConfigurationsOperations VpnServerConfigurations => new VpnServerConfigurationsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualHubsClient. </summary>
-        public virtual VirtualHubsClient GetVirtualHubsClient()
-        {
-            return new VirtualHubsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualHubsOperations. </summary>
+        public virtual VirtualHubsOperations VirtualHubs => new VirtualHubsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of HubVirtualNetworkConnectionsClient. </summary>
-        public virtual HubVirtualNetworkConnectionsClient GetHubVirtualNetworkConnectionsClient()
-        {
-            return new HubVirtualNetworkConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of HubVirtualNetworkConnectionsOperations. </summary>
+        public virtual HubVirtualNetworkConnectionsOperations HubVirtualNetworkConnections => new HubVirtualNetworkConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnGatewaysClient. </summary>
-        public virtual VpnGatewaysClient GetVpnGatewaysClient()
-        {
-            return new VpnGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnGatewaysOperations. </summary>
+        public virtual VpnGatewaysOperations VpnGateways => new VpnGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnConnectionsClient. </summary>
-        public virtual VpnConnectionsClient GetVpnConnectionsClient()
-        {
-            return new VpnConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnConnectionsOperations. </summary>
+        public virtual VpnConnectionsOperations VpnConnections => new VpnConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnSiteLinkConnectionsClient. </summary>
-        public virtual VpnSiteLinkConnectionsClient GetVpnSiteLinkConnectionsClient()
-        {
-            return new VpnSiteLinkConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnSiteLinkConnectionsOperations. </summary>
+        public virtual VpnSiteLinkConnectionsOperations VpnSiteLinkConnections => new VpnSiteLinkConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnLinkConnectionsClient. </summary>
-        public virtual VpnLinkConnectionsClient GetVpnLinkConnectionsClient()
-        {
-            return new VpnLinkConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnLinkConnectionsOperations. </summary>
+        public virtual VpnLinkConnectionsOperations VpnLinkConnections => new VpnLinkConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of P2SVpnGatewaysClient. </summary>
-        public virtual P2SVpnGatewaysClient GetP2SVpnGatewaysClient()
-        {
-            return new P2SVpnGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of P2SVpnGatewaysOperations. </summary>
+        public virtual P2SVpnGatewaysOperations P2SVpnGateways => new P2SVpnGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VpnServerConfigurationsAssociatedWithVirtualWanClient. </summary>
-        public virtual VpnServerConfigurationsAssociatedWithVirtualWanClient GetVpnServerConfigurationsAssociatedWithVirtualWanClient()
-        {
-            return new VpnServerConfigurationsAssociatedWithVirtualWanClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VpnServerConfigurationsAssociatedWithVirtualWanOperations. </summary>
+        public virtual VpnServerConfigurationsAssociatedWithVirtualWanOperations VpnServerConfigurationsAssociatedWithVirtualWan => new VpnServerConfigurationsAssociatedWithVirtualWanOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of VirtualHubRouteTableV2SClient. </summary>
-        public virtual VirtualHubRouteTableV2SClient GetVirtualHubRouteTableV2SClient()
-        {
-            return new VirtualHubRouteTableV2SClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of VirtualHubRouteTableV2SOperations. </summary>
+        public virtual VirtualHubRouteTableV2SOperations VirtualHubRouteTableV2S => new VirtualHubRouteTableV2SOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteGatewaysClient. </summary>
-        public virtual ExpressRouteGatewaysClient GetExpressRouteGatewaysClient()
-        {
-            return new ExpressRouteGatewaysClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteGatewaysOperations. </summary>
+        public virtual ExpressRouteGatewaysOperations ExpressRouteGateways => new ExpressRouteGatewaysOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ExpressRouteConnectionsClient. </summary>
-        public virtual ExpressRouteConnectionsClient GetExpressRouteConnectionsClient()
-        {
-            return new ExpressRouteConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ExpressRouteConnectionsOperations. </summary>
+        public virtual ExpressRouteConnectionsOperations ExpressRouteConnections => new ExpressRouteConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of HubRouteTablesClient. </summary>
-        public virtual HubRouteTablesClient GetHubRouteTablesClient()
-        {
-            return new HubRouteTablesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of HubRouteTablesOperations. </summary>
+        public virtual HubRouteTablesOperations HubRouteTables => new HubRouteTablesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of WebApplicationFirewallPoliciesClient. </summary>
-        public virtual WebApplicationFirewallPoliciesClient GetWebApplicationFirewallPoliciesClient()
-        {
-            return new WebApplicationFirewallPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of WebApplicationFirewallPoliciesOperations. </summary>
+        public virtual WebApplicationFirewallPoliciesOperations WebApplicationFirewallPolicies => new WebApplicationFirewallPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesOperations.cs
index 79715d42d3e26..aeb9936f8fd4b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkProfiles service client. </summary>
-    public partial class NetworkProfilesClient
+    public partial class NetworkProfilesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkProfilesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkProfilesClient for mocking. </summary>
-        protected NetworkProfilesClient()
+        internal NetworkProfilesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkProfilesOperations for mocking. </summary>
+        protected NetworkProfilesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkProfilesClient. </summary>
+        /// <summary> Initializes a new instance of NetworkProfilesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkProfilesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkProfilesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkProfilesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkProfilesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkProfilesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkProfile>> GetAsync(string resourceGroupName, string networkProfileName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkProfile>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkProfile> Get(string resourceGroupName, string networkProfileName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkProfile> Get(string resourceGroupName, string net
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkProfile>> CreateOrUpdateAsync(string resourceGroupName, string networkProfileName, NetworkProfile parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkProfile>> CreateOrUpdateAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkProfile> CreateOrUpdate(string resourceGroupName, string networkProfileName, NetworkProfile parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -124,7 +124,7 @@ public virtual Response<NetworkProfile> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkProfile>> UpdateTagsAsync(string resourceGroupName, string networkProfileName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -144,7 +144,7 @@ public virtual async Task<Response<NetworkProfile>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkProfile> UpdateTags(string resourceGroupName, string networkProfileName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -163,7 +163,7 @@ public virtual AsyncPageable<NetworkProfile> ListAllAsync(CancellationToken canc
         {
             async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -178,7 +178,7 @@ async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkProfile>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -200,7 +200,7 @@ public virtual Pageable<NetworkProfile> ListAll(CancellationToken cancellationTo
         {
             Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkProfile> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -243,7 +243,7 @@ public virtual AsyncPageable<NetworkProfile> ListAsync(string resourceGroupName,
 
             async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -258,7 +258,7 @@ async Task<Page<NetworkProfile>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkProfile>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ public virtual Pageable<NetworkProfile> List(string resourceGroupName, Cancellat
 
             Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -301,7 +301,7 @@ Page<NetworkProfile> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkProfile> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.List");
                 scope.Start();
                 try
                 {
@@ -332,7 +332,7 @@ public virtual async Task<NetworkProfilesDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(networkProfileName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -361,7 +361,7 @@ public virtual NetworkProfilesDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(networkProfileName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkProfilesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesRestOperations.cs
index 33b2d229eea82..90d6256297f94 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkProfilesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkProfilesRestClient
+    internal partial class NetworkProfilesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkProfilesRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkProfilesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkProfilesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkProfilesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsOperations.cs
index c42149a52b498..8fc63f75da898 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkSecurityGroups service client. </summary>
-    public partial class NetworkSecurityGroupsClient
+    public partial class NetworkSecurityGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkSecurityGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkSecurityGroupsClient for mocking. </summary>
-        protected NetworkSecurityGroupsClient()
+        internal NetworkSecurityGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkSecurityGroupsOperations for mocking. </summary>
+        protected NetworkSecurityGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkSecurityGroupsClient. </summary>
+        /// <summary> Initializes a new instance of NetworkSecurityGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkSecurityGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkSecurityGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkSecurityGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkSecurityGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkSecurityGroupsClient(ClientDiagnostics clientDiagnostics, HttpPi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkSecurityGroup>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkSecurityGroup>> GetAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkSecurityGroup> Get(string resourceGroupName, string networkSecurityGroupName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkSecurityGroup> Get(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string networkSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkSecurityGroup>> UpdateTagsAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkSecurityGroup> UpdateTags(string resourceGroupName, string networkSecurityGroupName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<NetworkSecurityGroup> ListAllAsync(CancellationToke
         {
             async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<NetworkSecurityGroup> ListAll(CancellationToken cancella
         {
             Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<NetworkSecurityGroup> ListAsync(string resourceGrou
 
             async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<NetworkSecurityGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkSecurityGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<NetworkSecurityGroup> List(string resourceGroupName, Can
 
             Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<NetworkSecurityGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkSecurityGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<NetworkSecurityGroupsDeleteOperation> StartDeleteAsync
                 throw new ArgumentNullException(nameof(networkSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual NetworkSecurityGroupsDeleteOperation StartDelete(string resourceG
                 throw new ArgumentNullException(nameof(networkSecurityGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<NetworkSecurityGroupsCreateOrUpdateOperation> StartCre
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual NetworkSecurityGroupsCreateOrUpdateOperation StartCreateOrUpdate(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkSecurityGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsRestOperations.cs
index e764fa51f6eea..dd39ee374b2d7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkSecurityGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkSecurityGroupsRestClient
+    internal partial class NetworkSecurityGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkSecurityGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkSecurityGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkSecurityGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkSecurityGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesOperations.cs
index bb555852ddb41..3b49909068eb5 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkVirtualAppliances service client. </summary>
-    public partial class NetworkVirtualAppliancesClient
+    public partial class NetworkVirtualAppliancesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkVirtualAppliancesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkVirtualAppliancesClient for mocking. </summary>
-        protected NetworkVirtualAppliancesClient()
+        internal NetworkVirtualAppliancesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkVirtualAppliancesOperations for mocking. </summary>
+        protected NetworkVirtualAppliancesOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkVirtualAppliancesClient. </summary>
+        /// <summary> Initializes a new instance of NetworkVirtualAppliancesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkVirtualAppliancesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkVirtualAppliancesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkVirtualAppliancesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkVirtualAppliancesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkVirtualAppliancesClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkVirtualAppliance>> GetAsync(string resourceGroupName, string networkVirtualApplianceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkVirtualAppliance>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkVirtualAppliance> Get(string resourceGroupName, string networkVirtualApplianceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<NetworkVirtualAppliance> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkVirtualAppliance>> UpdateTagsAsync(string resourceGroupName, string networkVirtualApplianceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<NetworkVirtualAppliance>> UpdateTagsAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkVirtualAppliance> UpdateTags(string resourceGroupName, string networkVirtualApplianceName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<NetworkVirtualAppliance> ListByResourceGroupAsync(s
 
             async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkVirtualAppliance>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<NetworkVirtualAppliance> ListByResourceGroup(string reso
 
             Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkVirtualAppliance> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<NetworkVirtualAppliance> ListAsync(CancellationToke
         {
             async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<NetworkVirtualAppliance>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<NetworkVirtualAppliance>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<NetworkVirtualAppliance> List(CancellationToken cancella
         {
             Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<NetworkVirtualAppliance> FirstPageFunc(int? pageSizeHint)
             }
             Page<NetworkVirtualAppliance> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<NetworkVirtualAppliancesDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(networkVirtualApplianceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual NetworkVirtualAppliancesDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(networkVirtualApplianceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<NetworkVirtualAppliancesCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual NetworkVirtualAppliancesCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkVirtualAppliancesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesRestOperations.cs
index c15b2293b0f7c..5c1351b6c1ae1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkVirtualAppliancesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkVirtualAppliancesRestClient
+    internal partial class NetworkVirtualAppliancesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkVirtualAppliancesRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkVirtualAppliancesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkVirtualAppliancesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkVirtualAppliancesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersOperations.cs
index f2129cb51ec77..3925b29bc35b4 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The NetworkWatchers service client. </summary>
-    public partial class NetworkWatchersClient
+    public partial class NetworkWatchersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal NetworkWatchersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of NetworkWatchersClient for mocking. </summary>
-        protected NetworkWatchersClient()
+        internal NetworkWatchersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of NetworkWatchersOperations for mocking. </summary>
+        protected NetworkWatchersOperations()
         {
         }
-        /// <summary> Initializes a new instance of NetworkWatchersClient. </summary>
+        /// <summary> Initializes a new instance of NetworkWatchersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal NetworkWatchersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal NetworkWatchersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new NetworkWatchersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new NetworkWatchersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal NetworkWatchersClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkWatcher>> CreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, NetworkWatcher parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<NetworkWatcher>> CreateOrUpdateAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkWatcher> CreateOrUpdate(string resourceGroupName, string networkWatcherName, NetworkWatcher parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -83,7 +83,7 @@ public virtual Response<NetworkWatcher> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkWatcher>> GetAsync(string resourceGroupName, string networkWatcherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.Get");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<NetworkWatcher>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkWatcher> Get(string resourceGroupName, string networkWatcherName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.Get");
             scope.Start();
             try
             {
@@ -122,7 +122,7 @@ public virtual Response<NetworkWatcher> Get(string resourceGroupName, string net
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<NetworkWatcher>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -142,7 +142,7 @@ public virtual async Task<Response<NetworkWatcher>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<NetworkWatcher> UpdateTags(string resourceGroupName, string networkWatcherName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -162,7 +162,7 @@ public virtual Response<NetworkWatcher> UpdateTags(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Topology>> GetTopologyAsync(string resourceGroupName, string networkWatcherName, TopologyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.GetTopology");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.GetTopology");
             scope.Start();
             try
             {
@@ -182,7 +182,7 @@ public virtual async Task<Response<Topology>> GetTopologyAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Topology> GetTopology(string resourceGroupName, string networkWatcherName, TopologyParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.GetTopology");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.GetTopology");
             scope.Start();
             try
             {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<NetworkWatcher> ListAsync(string resourceGroupName,
 
             async Task<Page<NetworkWatcher>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.List");
                 scope.Start();
                 try
                 {
@@ -235,7 +235,7 @@ public virtual Pageable<NetworkWatcher> List(string resourceGroupName, Cancellat
 
             Page<NetworkWatcher> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.List");
                 scope.Start();
                 try
                 {
@@ -257,7 +257,7 @@ public virtual AsyncPageable<NetworkWatcher> ListAllAsync(CancellationToken canc
         {
             async Task<Page<NetworkWatcher>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -279,7 +279,7 @@ public virtual Pageable<NetworkWatcher> ListAll(CancellationToken cancellationTo
         {
             Page<NetworkWatcher> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -310,7 +310,7 @@ public virtual async Task<NetworkWatchersDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(networkWatcherName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -339,7 +339,7 @@ public virtual NetworkWatchersDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(networkWatcherName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -373,7 +373,7 @@ public virtual async Task<NetworkWatchersVerifyIPFlowOperation> StartVerifyIPFlo
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartVerifyIPFlow");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartVerifyIPFlow");
             scope.Start();
             try
             {
@@ -407,7 +407,7 @@ public virtual NetworkWatchersVerifyIPFlowOperation StartVerifyIPFlow(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartVerifyIPFlow");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartVerifyIPFlow");
             scope.Start();
             try
             {
@@ -441,7 +441,7 @@ public virtual async Task<NetworkWatchersGetNextHopOperation> StartGetNextHopAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNextHop");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNextHop");
             scope.Start();
             try
             {
@@ -475,7 +475,7 @@ public virtual NetworkWatchersGetNextHopOperation StartGetNextHop(string resourc
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNextHop");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNextHop");
             scope.Start();
             try
             {
@@ -509,7 +509,7 @@ public virtual async Task<NetworkWatchersGetVMSecurityRulesOperation> StartGetVM
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetVMSecurityRules");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetVMSecurityRules");
             scope.Start();
             try
             {
@@ -543,7 +543,7 @@ public virtual NetworkWatchersGetVMSecurityRulesOperation StartGetVMSecurityRule
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetVMSecurityRules");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetVMSecurityRules");
             scope.Start();
             try
             {
@@ -577,7 +577,7 @@ public virtual async Task<NetworkWatchersGetTroubleshootingOperation> StartGetTr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshooting");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshooting");
             scope.Start();
             try
             {
@@ -611,7 +611,7 @@ public virtual NetworkWatchersGetTroubleshootingOperation StartGetTroubleshootin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshooting");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshooting");
             scope.Start();
             try
             {
@@ -645,7 +645,7 @@ public virtual async Task<NetworkWatchersGetTroubleshootingResultOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshootingResult");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshootingResult");
             scope.Start();
             try
             {
@@ -679,7 +679,7 @@ public virtual NetworkWatchersGetTroubleshootingResultOperation StartGetTroubles
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetTroubleshootingResult");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetTroubleshootingResult");
             scope.Start();
             try
             {
@@ -713,7 +713,7 @@ public virtual async Task<NetworkWatchersSetFlowLogConfigurationOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartSetFlowLogConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartSetFlowLogConfiguration");
             scope.Start();
             try
             {
@@ -747,7 +747,7 @@ public virtual NetworkWatchersSetFlowLogConfigurationOperation StartSetFlowLogCo
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartSetFlowLogConfiguration");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartSetFlowLogConfiguration");
             scope.Start();
             try
             {
@@ -781,7 +781,7 @@ public virtual async Task<NetworkWatchersGetFlowLogStatusOperation> StartGetFlow
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetFlowLogStatus");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetFlowLogStatus");
             scope.Start();
             try
             {
@@ -815,7 +815,7 @@ public virtual NetworkWatchersGetFlowLogStatusOperation StartGetFlowLogStatus(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetFlowLogStatus");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetFlowLogStatus");
             scope.Start();
             try
             {
@@ -849,7 +849,7 @@ public virtual async Task<NetworkWatchersCheckConnectivityOperation> StartCheckC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartCheckConnectivity");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartCheckConnectivity");
             scope.Start();
             try
             {
@@ -883,7 +883,7 @@ public virtual NetworkWatchersCheckConnectivityOperation StartCheckConnectivity(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartCheckConnectivity");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartCheckConnectivity");
             scope.Start();
             try
             {
@@ -917,7 +917,7 @@ public virtual async Task<NetworkWatchersGetAzureReachabilityReportOperation> St
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetAzureReachabilityReport");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetAzureReachabilityReport");
             scope.Start();
             try
             {
@@ -951,7 +951,7 @@ public virtual NetworkWatchersGetAzureReachabilityReportOperation StartGetAzureR
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetAzureReachabilityReport");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetAzureReachabilityReport");
             scope.Start();
             try
             {
@@ -985,7 +985,7 @@ public virtual async Task<NetworkWatchersListAvailableProvidersOperation> StartL
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartListAvailableProviders");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartListAvailableProviders");
             scope.Start();
             try
             {
@@ -1019,7 +1019,7 @@ public virtual NetworkWatchersListAvailableProvidersOperation StartListAvailable
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartListAvailableProviders");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartListAvailableProviders");
             scope.Start();
             try
             {
@@ -1053,7 +1053,7 @@ public virtual async Task<NetworkWatchersGetNetworkConfigurationDiagnosticOperat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNetworkConfigurationDiagnostic");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNetworkConfigurationDiagnostic");
             scope.Start();
             try
             {
@@ -1087,7 +1087,7 @@ public virtual NetworkWatchersGetNetworkConfigurationDiagnosticOperation StartGe
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersClient.StartGetNetworkConfigurationDiagnostic");
+            using var scope = _clientDiagnostics.CreateScope("NetworkWatchersOperations.StartGetNetworkConfigurationDiagnostic");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersRestOperations.cs
index 57432aaae7210..ae959088d2fb9 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/NetworkWatchersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class NetworkWatchersRestClient
+    internal partial class NetworkWatchersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of NetworkWatchersRestClient. </summary>
+        /// <summary> Initializes a new instance of NetworkWatchersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public NetworkWatchersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public NetworkWatchersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/OperationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/Operations.cs
similarity index 85%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/OperationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/Operations.cs
index 3a019c70cde41..063535b3b9941 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/OperationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/Operations.cs
@@ -15,23 +15,23 @@
 
 namespace Azure.Management.Network
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -42,7 +42,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -57,7 +57,7 @@ async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Operation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -79,7 +79,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -94,7 +94,7 @@ Page<Operation> FirstPageFunc(int? pageSizeHint)
             }
             Page<Operation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysOperations.cs
index bd0ca8e6a1a9f..e8d62cb536ffe 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The P2SVpnGateways service client. </summary>
-    public partial class P2SVpnGatewaysClient
+    public partial class P2SVpnGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal P2SVpnGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of P2SVpnGatewaysClient for mocking. </summary>
-        protected P2SVpnGatewaysClient()
+        internal P2SVpnGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of P2SVpnGatewaysOperations for mocking. </summary>
+        protected P2SVpnGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of P2SVpnGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of P2SVpnGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal P2SVpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal P2SVpnGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new P2SVpnGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new P2SVpnGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal P2SVpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<P2SVpnGateway>> GetAsync(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<P2SVpnGateway>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<P2SVpnGateway> Get(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<P2SVpnGateway> Get(string resourceGroupName, string gate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<P2SVpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, TagsObject p2SVpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<P2SVpnGateway>> UpdateTagsAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<P2SVpnGateway> UpdateTags(string resourceGroupName, string gatewayName, TagsObject p2SVpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<P2SVpnGateway> ListByResourceGroupAsync(string reso
 
             async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<P2SVpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<P2SVpnGateway> ListByResourceGroup(string resourceGroupN
 
             Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<P2SVpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<P2SVpnGateway> ListAsync(CancellationToken cancella
         {
             async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<P2SVpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<P2SVpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<P2SVpnGateway> List(CancellationToken cancellationToken
         {
             Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<P2SVpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<P2SVpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<P2SVpnGatewaysCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(p2SVpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual P2SVpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(p2SVpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<P2SVpnGatewaysDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual P2SVpnGatewaysDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -421,7 +421,7 @@ public virtual async Task<P2SVpnGatewaysGenerateVpnProfileOperation> StartGenera
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -455,7 +455,7 @@ public virtual P2SVpnGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -484,7 +484,7 @@ public virtual async Task<P2SVpnGatewaysGetP2SVpnConnectionHealthOperation> Star
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealth");
             scope.Start();
             try
             {
@@ -513,7 +513,7 @@ public virtual P2SVpnGatewaysGetP2SVpnConnectionHealthOperation StartGetP2SVpnCo
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealth");
             scope.Start();
             try
             {
@@ -547,7 +547,7 @@ public virtual async Task<P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperati
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealthDetailed");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealthDetailed");
             scope.Start();
             try
             {
@@ -581,7 +581,7 @@ public virtual P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation StartGet
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartGetP2SVpnConnectionHealthDetailed");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartGetP2SVpnConnectionHealthDetailed");
             scope.Start();
             try
             {
@@ -615,7 +615,7 @@ public virtual async Task<P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation> St
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDisconnectP2SVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDisconnectP2SVpnConnections");
             scope.Start();
             try
             {
@@ -649,7 +649,7 @@ public virtual P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation StartDisconnec
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysClient.StartDisconnectP2SVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("P2SVpnGatewaysOperations.StartDisconnectP2SVpnConnections");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysRestOperations.cs
index 85fe289e78f89..fc6085b6b0257 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/P2SVpnGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class P2SVpnGatewaysRestClient
+    internal partial class P2SVpnGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of P2SVpnGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of P2SVpnGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public P2SVpnGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public P2SVpnGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesOperations.cs
index 038b0cc8ed459..f0714dd6b05bd 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PacketCaptures service client. </summary>
-    public partial class PacketCapturesClient
+    public partial class PacketCapturesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PacketCapturesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PacketCapturesClient for mocking. </summary>
-        protected PacketCapturesClient()
+        internal PacketCapturesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PacketCapturesOperations for mocking. </summary>
+        protected PacketCapturesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PacketCapturesClient. </summary>
+        /// <summary> Initializes a new instance of PacketCapturesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PacketCapturesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PacketCapturesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PacketCapturesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PacketCapturesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PacketCapturesClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PacketCaptureResult>> GetAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PacketCaptureResult>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PacketCaptureResult> Get(string resourceGroupName, string networkWatcherName, string packetCaptureName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<PacketCaptureResult> ListAsync(string resourceGroup
 
             async Task<Page<PacketCaptureResult>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -127,7 +127,7 @@ public virtual Pageable<PacketCaptureResult> List(string resourceGroupName, stri
 
             Page<PacketCaptureResult> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.List");
                 scope.Start();
                 try
                 {
@@ -168,7 +168,7 @@ public virtual async Task<PacketCapturesCreateOperation> StartCreateAsync(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartCreate");
             scope.Start();
             try
             {
@@ -207,7 +207,7 @@ public virtual PacketCapturesCreateOperation StartCreate(string resourceGroupNam
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartCreate");
             scope.Start();
             try
             {
@@ -241,7 +241,7 @@ public virtual async Task<PacketCapturesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -275,7 +275,7 @@ public virtual PacketCapturesDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -309,7 +309,7 @@ public virtual async Task<PacketCapturesStopOperation> StartStopAsync(string res
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartStop");
             scope.Start();
             try
             {
@@ -343,7 +343,7 @@ public virtual PacketCapturesStopOperation StartStop(string resourceGroupName, s
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartStop");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartStop");
             scope.Start();
             try
             {
@@ -377,7 +377,7 @@ public virtual async Task<PacketCapturesGetStatusOperation> StartGetStatusAsync(
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartGetStatus");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartGetStatus");
             scope.Start();
             try
             {
@@ -411,7 +411,7 @@ public virtual PacketCapturesGetStatusOperation StartGetStatus(string resourceGr
                 throw new ArgumentNullException(nameof(packetCaptureName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PacketCapturesClient.StartGetStatus");
+            using var scope = _clientDiagnostics.CreateScope("PacketCapturesOperations.StartGetStatus");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesRestOperations.cs
index 4d7a49586526e..7d524041c8b26 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PacketCapturesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PacketCapturesRestClient
+    internal partial class PacketCapturesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PacketCapturesRestClient. </summary>
+        /// <summary> Initializes a new instance of PacketCapturesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PacketCapturesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PacketCapturesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsOperations.cs
index 73d89397505c8..a565e485a9d45 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PeerExpressRouteCircuitConnections service client. </summary>
-    public partial class PeerExpressRouteCircuitConnectionsClient
+    public partial class PeerExpressRouteCircuitConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PeerExpressRouteCircuitConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsClient for mocking. </summary>
-        protected PeerExpressRouteCircuitConnectionsClient()
+        internal PeerExpressRouteCircuitConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsOperations for mocking. </summary>
+        protected PeerExpressRouteCircuitConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PeerExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PeerExpressRouteCircuitConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PeerExpressRouteCircuitConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PeerExpressRouteCircuitConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal PeerExpressRouteCircuitConnectionsClient(ClientDiagnostics clientDiagno
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PeerExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<PeerExpressRouteCircuitConnection>> GetAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PeerExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual AsyncPageable<PeerExpressRouteCircuitConnection> ListAsync(string
 
             async Task<Page<PeerExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -116,7 +116,7 @@ async Task<Page<PeerExpressRouteCircuitConnection>> FirstPageFunc(int? pageSizeH
             }
             async Task<Page<PeerExpressRouteCircuitConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -154,7 +154,7 @@ public virtual Pageable<PeerExpressRouteCircuitConnection> List(string resourceG
 
             Page<PeerExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ Page<PeerExpressRouteCircuitConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<PeerExpressRouteCircuitConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PeerExpressRouteCircuitConnectionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsRestOperations.cs
index fef122e078595..ffbfafd16f95a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PeerExpressRouteCircuitConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PeerExpressRouteCircuitConnectionsRestClient
+    internal partial class PeerExpressRouteCircuitConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PeerExpressRouteCircuitConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PeerExpressRouteCircuitConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PeerExpressRouteCircuitConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsOperations.cs
index 87eb792de5129..7b3fb77d12f20 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PrivateDnsZoneGroups service client. </summary>
-    public partial class PrivateDnsZoneGroupsClient
+    public partial class PrivateDnsZoneGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateDnsZoneGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsClient for mocking. </summary>
-        protected PrivateDnsZoneGroupsClient()
+        internal PrivateDnsZoneGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsOperations for mocking. </summary>
+        protected PrivateDnsZoneGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PrivateDnsZoneGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PrivateDnsZoneGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PrivateDnsZoneGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PrivateDnsZoneGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateDnsZoneGroupsClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateDnsZoneGroup>> GetAsync(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateDnsZoneGroup>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateDnsZoneGroup> Get(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<PrivateDnsZoneGroup> ListAsync(string privateEndpoi
 
             async Task<Page<PrivateDnsZoneGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<PrivateDnsZoneGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateDnsZoneGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<PrivateDnsZoneGroup> List(string privateEndpointName, st
 
             Page<PrivateDnsZoneGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<PrivateDnsZoneGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateDnsZoneGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<PrivateDnsZoneGroupsDeleteOperation> StartDeleteAsync(
                 throw new ArgumentNullException(nameof(privateDnsZoneGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual PrivateDnsZoneGroupsDeleteOperation StartDelete(string resourceGr
                 throw new ArgumentNullException(nameof(privateDnsZoneGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<PrivateDnsZoneGroupsCreateOrUpdateOperation> StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual PrivateDnsZoneGroupsCreateOrUpdateOperation StartCreateOrUpdate(s
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateDnsZoneGroupsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsRestOperations.cs
index 123368dd9e27d..2b083cb156ffb 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateDnsZoneGroupsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PrivateDnsZoneGroupsRestClient
+    internal partial class PrivateDnsZoneGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateDnsZoneGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateDnsZoneGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PrivateDnsZoneGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsOperations.cs
index c8f2cba13ec76..8e7d0bd89b50c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PrivateEndpoints service client. </summary>
-    public partial class PrivateEndpointsClient
+    public partial class PrivateEndpointsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateEndpointsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateEndpointsClient for mocking. </summary>
-        protected PrivateEndpointsClient()
+        internal PrivateEndpointsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateEndpointsOperations for mocking. </summary>
+        protected PrivateEndpointsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateEndpointsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PrivateEndpointsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PrivateEndpointsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PrivateEndpointsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PrivateEndpointsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateEndpointsClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpoint>> GetAsync(string resourceGroupName, string privateEndpointName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateEndpoint>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpoint> Get(string resourceGroupName, string privateEndpointName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<PrivateEndpoint> ListAsync(string resourceGroupName
 
             async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpoint>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<PrivateEndpoint> List(string resourceGroupName, Cancella
 
             Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpoint> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.List");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<PrivateEndpoint> ListBySubscriptionAsync(Cancellati
         {
             async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<PrivateEndpoint>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpoint>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<PrivateEndpoint> ListBySubscription(CancellationToken ca
         {
             Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<PrivateEndpoint> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpoint> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ public virtual async Task<PrivateEndpointsDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(privateEndpointName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -281,7 +281,7 @@ public virtual PrivateEndpointsDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(privateEndpointName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual async Task<PrivateEndpointsCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual PrivateEndpointsCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsRestOperations.cs
index 3fae1f6d8014e..6095b53c6e45c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateEndpointsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PrivateEndpointsRestClient
+    internal partial class PrivateEndpointsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateEndpointsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateEndpointsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PrivateEndpointsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesOperations.cs
index 73979cf20c6f4..906498c7f85fe 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PrivateLinkServices service client. </summary>
-    public partial class PrivateLinkServicesClient
+    public partial class PrivateLinkServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateLinkServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateLinkServicesClient for mocking. </summary>
-        protected PrivateLinkServicesClient()
+        internal PrivateLinkServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateLinkServicesOperations for mocking. </summary>
+        protected PrivateLinkServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateLinkServicesClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PrivateLinkServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PrivateLinkServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PrivateLinkServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PrivateLinkServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PrivateLinkServicesClient(ClientDiagnostics clientDiagnostics, HttpPipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkService>> GetAsync(string resourceGroupName, string serviceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PrivateLinkService>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkService> Get(string resourceGroupName, string serviceName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.Get");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<PrivateLinkService> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> GetPrivateEndpointConnectionAsync(string resourceGroupName, string serviceName, string peConnectionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.GetPrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.GetPrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -106,7 +106,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> GetPrivateEndpoin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> GetPrivateEndpointConnection(string resourceGroupName, string serviceName, string peConnectionName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.GetPrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.GetPrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<PrivateEndpointConnection> GetPrivateEndpointConnection(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> UpdatePrivateEndpointConnectionAsync(string resourceGroupName, string serviceName, string peConnectionName, PrivateEndpointConnection parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.UpdatePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.UpdatePrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -148,7 +148,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> UpdatePrivateEndp
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> UpdatePrivateEndpointConnection(string resourceGroupName, string serviceName, string peConnectionName, PrivateEndpointConnection parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.UpdatePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.UpdatePrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -167,7 +167,7 @@ public virtual Response<PrivateEndpointConnection> UpdatePrivateEndpointConnecti
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLinkServiceVisibilityAsync(string location, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibility");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibility");
             scope.Start();
             try
             {
@@ -186,7 +186,7 @@ public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibility(string location, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibility");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibility");
             scope.Start();
             try
             {
@@ -206,7 +206,7 @@ public virtual Response<PrivateLinkServiceVisibility> CheckPrivateLinkServiceVis
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLinkServiceVisibilityByResourceGroupAsync(string location, string resourceGroupName, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibilityByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibilityByResourceGroup");
             scope.Start();
             try
             {
@@ -226,7 +226,7 @@ public virtual async Task<Response<PrivateLinkServiceVisibility>> CheckPrivateLi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibilityByResourceGroup(string location, string resourceGroupName, CheckPrivateLinkServiceVisibilityRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.CheckPrivateLinkServiceVisibilityByResourceGroup");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.CheckPrivateLinkServiceVisibilityByResourceGroup");
             scope.Start();
             try
             {
@@ -251,7 +251,7 @@ public virtual AsyncPageable<PrivateLinkService> ListAsync(string resourceGroupN
 
             async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -266,7 +266,7 @@ async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -294,7 +294,7 @@ public virtual Pageable<PrivateLinkService> List(string resourceGroupName, Cance
 
             Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -309,7 +309,7 @@ Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -331,7 +331,7 @@ public virtual AsyncPageable<PrivateLinkService> ListBySubscriptionAsync(Cancell
         {
             async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -346,7 +346,7 @@ async Task<Page<PrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -368,7 +368,7 @@ public virtual Pageable<PrivateLinkService> ListBySubscription(CancellationToken
         {
             Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -383,7 +383,7 @@ Page<PrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListBySubscription");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListBySubscription");
                 scope.Start();
                 try
                 {
@@ -416,7 +416,7 @@ public virtual AsyncPageable<PrivateEndpointConnection> ListPrivateEndpointConne
 
             async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -431,7 +431,7 @@ async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PrivateEndpointConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -464,7 +464,7 @@ public virtual Pageable<PrivateEndpointConnection> ListPrivateEndpointConnection
 
             Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -479,7 +479,7 @@ Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<PrivateEndpointConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListPrivateEndpointConnections");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListPrivateEndpointConnections");
                 scope.Start();
                 try
                 {
@@ -507,7 +507,7 @@ public virtual AsyncPageable<AutoApprovedPrivateLinkService> ListAutoApprovedPri
 
             async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -522,7 +522,7 @@ async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint
             }
             async Task<Page<AutoApprovedPrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -550,7 +550,7 @@ public virtual Pageable<AutoApprovedPrivateLinkService> ListAutoApprovedPrivateL
 
             Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -565,7 +565,7 @@ Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<AutoApprovedPrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServices");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServices");
                 scope.Start();
                 try
                 {
@@ -598,7 +598,7 @@ public virtual AsyncPageable<AutoApprovedPrivateLinkService> ListAutoApprovedPri
 
             async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -613,7 +613,7 @@ async Task<Page<AutoApprovedPrivateLinkService>> FirstPageFunc(int? pageSizeHint
             }
             async Task<Page<AutoApprovedPrivateLinkService>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -646,7 +646,7 @@ public virtual Pageable<AutoApprovedPrivateLinkService> ListAutoApprovedPrivateL
 
             Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -661,7 +661,7 @@ Page<AutoApprovedPrivateLinkService> FirstPageFunc(int? pageSizeHint)
             }
             Page<AutoApprovedPrivateLinkService> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.ListAutoApprovedPrivateLinkServicesByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.ListAutoApprovedPrivateLinkServicesByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -692,7 +692,7 @@ public virtual async Task<PrivateLinkServicesDeleteOperation> StartDeleteAsync(s
                 throw new ArgumentNullException(nameof(serviceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -721,7 +721,7 @@ public virtual PrivateLinkServicesDeleteOperation StartDelete(string resourceGro
                 throw new ArgumentNullException(nameof(serviceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -755,7 +755,7 @@ public virtual async Task<PrivateLinkServicesCreateOrUpdateOperation> StartCreat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -789,7 +789,7 @@ public virtual PrivateLinkServicesCreateOrUpdateOperation StartCreateOrUpdate(st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -823,7 +823,7 @@ public virtual async Task<PrivateLinkServicesDeletePrivateEndpointConnectionOper
                 throw new ArgumentNullException(nameof(peConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDeletePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDeletePrivateEndpointConnection");
             scope.Start();
             try
             {
@@ -857,7 +857,7 @@ public virtual PrivateLinkServicesDeletePrivateEndpointConnectionOperation Start
                 throw new ArgumentNullException(nameof(peConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesClient.StartDeletePrivateEndpointConnection");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkServicesOperations.StartDeletePrivateEndpointConnection");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesRestOperations.cs
index 7d500ef4ae357..a912b75f99a65 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PrivateLinkServicesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PrivateLinkServicesRestClient
+    internal partial class PrivateLinkServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateLinkServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateLinkServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PrivateLinkServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesOperations.cs
index 7ba3c73cd66e8..bfb237c0f9711 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PublicIPAddresses service client. </summary>
-    public partial class PublicIPAddressesClient
+    public partial class PublicIPAddressesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PublicIPAddressesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PublicIPAddressesClient for mocking. </summary>
-        protected PublicIPAddressesClient()
+        internal PublicIPAddressesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PublicIPAddressesOperations for mocking. </summary>
+        protected PublicIPAddressesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PublicIPAddressesClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPAddressesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PublicIPAddressesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PublicIPAddressesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PublicIPAddressesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PublicIPAddressesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PublicIPAddressesClient(ClientDiagnostics clientDiagnostics, HttpPipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPAddress>> GetAsync(string resourceGroupName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PublicIPAddress>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPAddress> Get(string resourceGroupName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<PublicIPAddress> Get(string resourceGroupName, string pu
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPAddress>> UpdateTagsAsync(string resourceGroupName, string publicIpAddressName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<PublicIPAddress>> UpdateTagsAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPAddress> UpdateTags(string resourceGroupName, string publicIpAddressName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -128,7 +128,7 @@ public virtual Response<PublicIPAddress> UpdateTags(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPAddress>> GetVirtualMachineScaleSetPublicIPAddressAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.GetVirtualMachineScaleSetPublicIPAddress");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.GetVirtualMachineScaleSetPublicIPAddress");
             scope.Start();
             try
             {
@@ -152,7 +152,7 @@ public virtual async Task<Response<PublicIPAddress>> GetVirtualMachineScaleSetPu
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPAddress> GetVirtualMachineScaleSetPublicIPAddress(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string publicIpAddressName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.GetVirtualMachineScaleSetPublicIPAddress");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.GetVirtualMachineScaleSetPublicIPAddress");
             scope.Start();
             try
             {
@@ -171,7 +171,7 @@ public virtual AsyncPageable<PublicIPAddress> ListAllAsync(CancellationToken can
         {
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -186,7 +186,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -208,7 +208,7 @@ public virtual Pageable<PublicIPAddress> ListAll(CancellationToken cancellationT
         {
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -223,7 +223,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -251,7 +251,7 @@ public virtual AsyncPageable<PublicIPAddress> ListAsync(string resourceGroupName
 
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -266,7 +266,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -294,7 +294,7 @@ public virtual Pageable<PublicIPAddress> List(string resourceGroupName, Cancella
 
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -309,7 +309,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.List");
                 scope.Start();
                 try
                 {
@@ -342,7 +342,7 @@ public virtual AsyncPageable<PublicIPAddress> ListVirtualMachineScaleSetPublicIP
 
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -357,7 +357,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -390,7 +390,7 @@ public virtual Pageable<PublicIPAddress> ListVirtualMachineScaleSetPublicIPAddre
 
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -405,7 +405,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -453,7 +453,7 @@ public virtual AsyncPageable<PublicIPAddress> ListVirtualMachineScaleSetVMPublic
 
             async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -468,7 +468,7 @@ async Task<Page<PublicIPAddress>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPAddress>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -516,7 +516,7 @@ public virtual Pageable<PublicIPAddress> ListVirtualMachineScaleSetVMPublicIPAdd
 
             Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -531,7 +531,7 @@ Page<PublicIPAddress> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPAddress> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.ListVirtualMachineScaleSetVMPublicIPAddresses");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.ListVirtualMachineScaleSetVMPublicIPAddresses");
                 scope.Start();
                 try
                 {
@@ -562,7 +562,7 @@ public virtual async Task<PublicIPAddressesDeleteOperation> StartDeleteAsync(str
                 throw new ArgumentNullException(nameof(publicIpAddressName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -591,7 +591,7 @@ public virtual PublicIPAddressesDeleteOperation StartDelete(string resourceGroup
                 throw new ArgumentNullException(nameof(publicIpAddressName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -625,7 +625,7 @@ public virtual async Task<PublicIPAddressesCreateOrUpdateOperation> StartCreateO
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -659,7 +659,7 @@ public virtual PublicIPAddressesCreateOrUpdateOperation StartCreateOrUpdate(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPAddressesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesRestOperations.cs
index cf51c686efbc4..2e07c19937be4 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPAddressesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PublicIPAddressesRestClient
+    internal partial class PublicIPAddressesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PublicIPAddressesRestClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPAddressesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PublicIPAddressesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PublicIPAddressesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesOperations.cs
index 786f2ea0f396c..41e472c10a5f1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The PublicIPPrefixes service client. </summary>
-    public partial class PublicIPPrefixesClient
+    public partial class PublicIPPrefixesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PublicIPPrefixesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PublicIPPrefixesClient for mocking. </summary>
-        protected PublicIPPrefixesClient()
+        internal PublicIPPrefixesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PublicIPPrefixesOperations for mocking. </summary>
+        protected PublicIPPrefixesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PublicIPPrefixesClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPPrefixesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal PublicIPPrefixesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal PublicIPPrefixesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new PublicIPPrefixesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new PublicIPPrefixesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal PublicIPPrefixesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPPrefix>> GetAsync(string resourceGroupName, string publicIpPrefixName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<PublicIPPrefix>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPPrefix> Get(string resourceGroupName, string publicIpPrefixName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<PublicIPPrefix> Get(string resourceGroupName, string pub
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PublicIPPrefix>> UpdateTagsAsync(string resourceGroupName, string publicIpPrefixName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<PublicIPPrefix>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PublicIPPrefix> UpdateTags(string resourceGroupName, string publicIpPrefixName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<PublicIPPrefix> ListAllAsync(CancellationToken canc
         {
             async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPPrefix>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<PublicIPPrefix> ListAll(CancellationToken cancellationTo
         {
             Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPPrefix> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<PublicIPPrefix> ListAsync(string resourceGroupName,
 
             async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<PublicIPPrefix>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<PublicIPPrefix>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<PublicIPPrefix> List(string resourceGroupName, Cancellat
 
             Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<PublicIPPrefix> FirstPageFunc(int? pageSizeHint)
             }
             Page<PublicIPPrefix> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<PublicIPPrefixesDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(publicIpPrefixName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual PublicIPPrefixesDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(publicIpPrefixName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<PublicIPPrefixesCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual PublicIPPrefixesCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("PublicIPPrefixesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesRestOperations.cs
index 4687db4856336..07cd112cb178b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/PublicIPPrefixesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class PublicIPPrefixesRestClient
+    internal partial class PublicIPPrefixesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PublicIPPrefixesRestClient. </summary>
+        /// <summary> Initializes a new instance of PublicIPPrefixesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PublicIPPrefixesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public PublicIPPrefixesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksOperations.cs
similarity index 84%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksOperations.cs
index 8a40cebb8c358..0b06e9dfe26d7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ResourceNavigationLinks service client. </summary>
-    public partial class ResourceNavigationLinksClient
+    public partial class ResourceNavigationLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceNavigationLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceNavigationLinksClient for mocking. </summary>
-        protected ResourceNavigationLinksClient()
+        internal ResourceNavigationLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceNavigationLinksOperations for mocking. </summary>
+        protected ResourceNavigationLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceNavigationLinksClient. </summary>
+        /// <summary> Initializes a new instance of ResourceNavigationLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ResourceNavigationLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ResourceNavigationLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ResourceNavigationLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ResourceNavigationLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ResourceNavigationLinksClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceNavigationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksOperations.List");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ResourceNavigationLinksListResult>> ListAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceNavigationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ResourceNavigationLinksOperations.List");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksRestOperations.cs
index d0834bafe64f1..f2be87f1bc48b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ResourceNavigationLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ResourceNavigationLinksRestClient
+    internal partial class ResourceNavigationLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceNavigationLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceNavigationLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceNavigationLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ResourceNavigationLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/OperationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/OperationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RestOperations.cs
index 2579c6d317a17..deefe7f2cce36 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/OperationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RestOperations.cs
@@ -16,17 +16,17 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null)
         {
             endpoint ??= new Uri("https://management.azure.com");
 
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesOperations.cs
index f6441a9d60f11..2da0620e1b8e9 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The RouteFilterRules service client. </summary>
-    public partial class RouteFilterRulesClient
+    public partial class RouteFilterRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RouteFilterRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RouteFilterRulesClient for mocking. </summary>
-        protected RouteFilterRulesClient()
+        internal RouteFilterRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RouteFilterRulesOperations for mocking. </summary>
+        protected RouteFilterRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of RouteFilterRulesClient. </summary>
+        /// <summary> Initializes a new instance of RouteFilterRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RouteFilterRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RouteFilterRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RouteFilterRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RouteFilterRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RouteFilterRulesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteFilterRule>> GetAsync(string resourceGroupName, string routeFilterName, string ruleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<RouteFilterRule>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteFilterRule> Get(string resourceGroupName, string routeFilterName, string ruleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<RouteFilterRule> ListByRouteFilterAsync(string reso
 
             async Task<Page<RouteFilterRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<RouteFilterRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteFilterRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<RouteFilterRule> ListByRouteFilter(string resourceGroupN
 
             Page<RouteFilterRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<RouteFilterRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteFilterRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.ListByRouteFilter");
+                using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.ListByRouteFilter");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<RouteFilterRulesDeleteOperation> StartDeleteAsync(stri
                 throw new ArgumentNullException(nameof(ruleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual RouteFilterRulesDeleteOperation StartDelete(string resourceGroupN
                 throw new ArgumentNullException(nameof(ruleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<RouteFilterRulesCreateOrUpdateOperation> StartCreateOr
                 throw new ArgumentNullException(nameof(routeFilterRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual RouteFilterRulesCreateOrUpdateOperation StartCreateOrUpdate(strin
                 throw new ArgumentNullException(nameof(routeFilterRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFilterRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesRestOperations.cs
index 66c444b92c128..876437f09f779 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFilterRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class RouteFilterRulesRestClient
+    internal partial class RouteFilterRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RouteFilterRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of RouteFilterRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RouteFilterRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RouteFilterRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersOperations.cs
index 5855691edc54f..bbb12e6aade3b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The RouteFilters service client. </summary>
-    public partial class RouteFiltersClient
+    public partial class RouteFiltersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RouteFiltersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RouteFiltersClient for mocking. </summary>
-        protected RouteFiltersClient()
+        internal RouteFiltersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RouteFiltersOperations for mocking. </summary>
+        protected RouteFiltersOperations()
         {
         }
-        /// <summary> Initializes a new instance of RouteFiltersClient. </summary>
+        /// <summary> Initializes a new instance of RouteFiltersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RouteFiltersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RouteFiltersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RouteFiltersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RouteFiltersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RouteFiltersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteFilter>> GetAsync(string resourceGroupName, string routeFilterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<RouteFilter>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteFilter> Get(string resourceGroupName, string routeFilterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<RouteFilter> Get(string resourceGroupName, string routeF
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteFilter>> UpdateTagsAsync(string resourceGroupName, string routeFilterName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<RouteFilter>> UpdateTagsAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteFilter> UpdateTags(string resourceGroupName, string routeFilterName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<RouteFilter> ListByResourceGroupAsync(string resour
 
             async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteFilter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<RouteFilter> ListByResourceGroup(string resourceGroupNam
 
             Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteFilter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<RouteFilter> ListAsync(CancellationToken cancellati
         {
             async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<RouteFilter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteFilter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<RouteFilter> List(CancellationToken cancellationToken =
         {
             Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<RouteFilter> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteFilter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.List");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<RouteFiltersDeleteOperation> StartDeleteAsync(string r
                 throw new ArgumentNullException(nameof(routeFilterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual RouteFiltersDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(routeFilterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<RouteFiltersCreateOrUpdateOperation> StartCreateOrUpda
                 throw new ArgumentNullException(nameof(routeFilterParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual RouteFiltersCreateOrUpdateOperation StartCreateOrUpdate(string re
                 throw new ArgumentNullException(nameof(routeFilterParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteFiltersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteFiltersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersRestOperations.cs
index 84040b4374375..c16c82a6cd900 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteFiltersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class RouteFiltersRestClient
+    internal partial class RouteFiltersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RouteFiltersRestClient. </summary>
+        /// <summary> Initializes a new instance of RouteFiltersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RouteFiltersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RouteFiltersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesOperations.cs
index 7a9226f27f051..fb06169c4ae41 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The RouteTables service client. </summary>
-    public partial class RouteTablesClient
+    public partial class RouteTablesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RouteTablesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RouteTablesClient for mocking. </summary>
-        protected RouteTablesClient()
+        internal RouteTablesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RouteTablesOperations for mocking. </summary>
+        protected RouteTablesOperations()
         {
         }
-        /// <summary> Initializes a new instance of RouteTablesClient. </summary>
+        /// <summary> Initializes a new instance of RouteTablesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RouteTablesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RouteTablesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RouteTablesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RouteTablesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteTable>> GetAsync(string resourceGroupName, string routeTableName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<RouteTable>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteTable> Get(string resourceGroupName, string routeTableName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<RouteTable> Get(string resourceGroupName, string routeTa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<RouteTable>> UpdateTagsAsync(string resourceGroupName, string routeTableName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<RouteTable>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<RouteTable> UpdateTags(string resourceGroupName, string routeTableName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual AsyncPageable<RouteTable> ListAsync(string resourceGroupName, Can
 
             async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteTable>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -172,7 +172,7 @@ public virtual Pageable<RouteTable> List(string resourceGroupName, CancellationT
 
             Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -187,7 +187,7 @@ Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteTable> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.List");
                 scope.Start();
                 try
                 {
@@ -209,7 +209,7 @@ public virtual AsyncPageable<RouteTable> ListAllAsync(CancellationToken cancella
         {
             async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -224,7 +224,7 @@ async Task<Page<RouteTable>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<RouteTable>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<RouteTable> ListAll(CancellationToken cancellationToken
         {
             Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<RouteTable> FirstPageFunc(int? pageSizeHint)
             }
             Page<RouteTable> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<RouteTablesDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual RouteTablesDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<RouteTablesCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual RouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RouteTablesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RouteTablesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesRestOperations.cs
index 733db0afa2e3b..9bc6608e52d18 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RouteTablesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class RouteTablesRestClient
+    internal partial class RouteTablesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RouteTablesRestClient. </summary>
+        /// <summary> Initializes a new instance of RouteTablesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RouteTablesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RouteTablesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesOperations.cs
index fd51bca1b977c..8713940b521f1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The Routes service client. </summary>
-    public partial class RoutesClient
+    public partial class RoutesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal RoutesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of RoutesClient for mocking. </summary>
-        protected RoutesClient()
+        internal RoutesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of RoutesOperations for mocking. </summary>
+        protected RoutesOperations()
         {
         }
-        /// <summary> Initializes a new instance of RoutesClient. </summary>
+        /// <summary> Initializes a new instance of RoutesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal RoutesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal RoutesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new RoutesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new RoutesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal RoutesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Route>> GetAsync(string resourceGroupName, string routeTableName, string routeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<Route>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Route> Get(string resourceGroupName, string routeTableName, string routeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<Route> ListAsync(string resourceGroupName, string r
 
             async Task<Page<Route>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<Route>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Route>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<Route> List(string resourceGroupName, string routeTableN
 
             Page<Route> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<Route> FirstPageFunc(int? pageSizeHint)
             }
             Page<Route> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("RoutesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("RoutesOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<RoutesDeleteOperation> StartDeleteAsync(string resourc
                 throw new ArgumentNullException(nameof(routeName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual RoutesDeleteOperation StartDelete(string resourceGroupName, strin
                 throw new ArgumentNullException(nameof(routeName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<RoutesCreateOrUpdateOperation> StartCreateOrUpdateAsyn
                 throw new ArgumentNullException(nameof(routeParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual RoutesCreateOrUpdateOperation StartCreateOrUpdate(string resource
                 throw new ArgumentNullException(nameof(routeParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("RoutesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("RoutesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesRestOperations.cs
index 5d4690d45e130..6dc1e62a44df2 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/RoutesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class RoutesRestClient
+    internal partial class RoutesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of RoutesRestClient. </summary>
+        /// <summary> Initializes a new instance of RoutesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public RoutesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public RoutesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersOperations.cs
index e25f39e4787a2..3ee876e5f451e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The SecurityPartnerProviders service client. </summary>
-    public partial class SecurityPartnerProvidersClient
+    public partial class SecurityPartnerProvidersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SecurityPartnerProvidersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SecurityPartnerProvidersClient for mocking. </summary>
-        protected SecurityPartnerProvidersClient()
+        internal SecurityPartnerProvidersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SecurityPartnerProvidersOperations for mocking. </summary>
+        protected SecurityPartnerProvidersOperations()
         {
         }
-        /// <summary> Initializes a new instance of SecurityPartnerProvidersClient. </summary>
+        /// <summary> Initializes a new instance of SecurityPartnerProvidersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SecurityPartnerProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SecurityPartnerProvidersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SecurityPartnerProvidersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SecurityPartnerProvidersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal SecurityPartnerProvidersClient(ClientDiagnostics clientDiagnostics, Htt
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityPartnerProvider>> GetAsync(string resourceGroupName, string securityPartnerProviderName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<SecurityPartnerProvider>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityPartnerProvider> Get(string resourceGroupName, string securityPartnerProviderName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<SecurityPartnerProvider> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityPartnerProvider>> UpdateTagsAsync(string resourceGroupName, string securityPartnerProviderName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<SecurityPartnerProvider>> UpdateTagsAsync(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityPartnerProvider> UpdateTags(string resourceGroupName, string securityPartnerProviderName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<SecurityPartnerProvider> ListByResourceGroupAsync(s
 
             async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityPartnerProvider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<SecurityPartnerProvider> ListByResourceGroup(string reso
 
             Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityPartnerProvider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<SecurityPartnerProvider> ListAsync(CancellationToke
         {
             async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<SecurityPartnerProvider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityPartnerProvider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<SecurityPartnerProvider> List(CancellationToken cancella
         {
             Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<SecurityPartnerProvider> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityPartnerProvider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<SecurityPartnerProvidersDeleteOperation> StartDeleteAs
                 throw new ArgumentNullException(nameof(securityPartnerProviderName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual SecurityPartnerProvidersDeleteOperation StartDelete(string resour
                 throw new ArgumentNullException(nameof(securityPartnerProviderName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<SecurityPartnerProvidersCreateOrUpdateOperation> Start
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual SecurityPartnerProvidersCreateOrUpdateOperation StartCreateOrUpda
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityPartnerProvidersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersRestOperations.cs
index 81191f1a1cb44..2aaf5d2994f02 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityPartnerProvidersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class SecurityPartnerProvidersRestClient
+    internal partial class SecurityPartnerProvidersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SecurityPartnerProvidersRestClient. </summary>
+        /// <summary> Initializes a new instance of SecurityPartnerProvidersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SecurityPartnerProvidersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SecurityPartnerProvidersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesOperations.cs
index a1563025de725..5957a2c135b49 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The SecurityRules service client. </summary>
-    public partial class SecurityRulesClient
+    public partial class SecurityRulesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SecurityRulesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SecurityRulesClient for mocking. </summary>
-        protected SecurityRulesClient()
+        internal SecurityRulesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SecurityRulesOperations for mocking. </summary>
+        protected SecurityRulesOperations()
         {
         }
-        /// <summary> Initializes a new instance of SecurityRulesClient. </summary>
+        /// <summary> Initializes a new instance of SecurityRulesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SecurityRulesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SecurityRulesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SecurityRulesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal SecurityRulesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<SecurityRule>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<SecurityRule> ListAsync(string resourceGroupName, s
 
             async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<SecurityRule>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<SecurityRule>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<SecurityRule> List(string resourceGroupName, string netw
 
             Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<SecurityRule> FirstPageFunc(int? pageSizeHint)
             }
             Page<SecurityRule> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<SecurityRulesDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(securityRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual SecurityRulesDeleteOperation StartDelete(string resourceGroupName
                 throw new ArgumentNullException(nameof(securityRuleName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<SecurityRulesCreateOrUpdateOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(securityRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual SecurityRulesCreateOrUpdateOperation StartCreateOrUpdate(string r
                 throw new ArgumentNullException(nameof(securityRuleParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SecurityRulesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SecurityRulesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesRestOperations.cs
index 98e3f80476d89..3eebd56c1f18a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SecurityRulesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class SecurityRulesRestClient
+    internal partial class SecurityRulesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SecurityRulesRestClient. </summary>
+        /// <summary> Initializes a new instance of SecurityRulesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SecurityRulesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SecurityRulesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksOperations.cs
similarity index 84%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksOperations.cs
index 412149c456136..3585594aa1d6d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ServiceAssociationLinks service client. </summary>
-    public partial class ServiceAssociationLinksClient
+    public partial class ServiceAssociationLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceAssociationLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceAssociationLinksClient for mocking. </summary>
-        protected ServiceAssociationLinksClient()
+        internal ServiceAssociationLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceAssociationLinksOperations for mocking. </summary>
+        protected ServiceAssociationLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceAssociationLinksClient. </summary>
+        /// <summary> Initializes a new instance of ServiceAssociationLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceAssociationLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceAssociationLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceAssociationLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceAssociationLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ServiceAssociationLinksClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceAssociationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksOperations.List");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response<ServiceAssociationLinksListResult>> ListAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceAssociationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceAssociationLinksOperations.List");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksRestOperations.cs
index 00a926ee468e1..b3923fc09576c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceAssociationLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ServiceAssociationLinksRestClient
+    internal partial class ServiceAssociationLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceAssociationLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceAssociationLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceAssociationLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceAssociationLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesOperations.cs
index 0b020b13766c4..1822964cfc2ae 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ServiceEndpointPolicies service client. </summary>
-    public partial class ServiceEndpointPoliciesClient
+    public partial class ServiceEndpointPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceEndpointPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceEndpointPoliciesClient for mocking. </summary>
-        protected ServiceEndpointPoliciesClient()
+        internal ServiceEndpointPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceEndpointPoliciesOperations for mocking. </summary>
+        protected ServiceEndpointPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceEndpointPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceEndpointPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceEndpointPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceEndpointPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceEndpointPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ServiceEndpointPoliciesClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceEndpointPolicy>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ServiceEndpointPolicy>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceEndpointPolicy> Get(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<ServiceEndpointPolicy> Get(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceEndpointPolicy>> UpdateTagsAsync(string resourceGroupName, string serviceEndpointPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<ServiceEndpointPolicy>> UpdateTagsAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceEndpointPolicy> UpdateTags(string resourceGroupName, string serviceEndpointPolicyName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -123,7 +123,7 @@ public virtual AsyncPageable<ServiceEndpointPolicy> ListAsync(CancellationToken
         {
             async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -138,7 +138,7 @@ async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ServiceEndpointPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ public virtual Pageable<ServiceEndpointPolicy> List(CancellationToken cancellati
         {
             Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -175,7 +175,7 @@ Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServiceEndpointPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ public virtual AsyncPageable<ServiceEndpointPolicy> ListByResourceGroupAsync(str
 
             async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -218,7 +218,7 @@ async Task<Page<ServiceEndpointPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ServiceEndpointPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -246,7 +246,7 @@ public virtual Pageable<ServiceEndpointPolicy> ListByResourceGroup(string resour
 
             Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -261,7 +261,7 @@ Page<ServiceEndpointPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServiceEndpointPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -292,7 +292,7 @@ public virtual async Task<ServiceEndpointPoliciesDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -321,7 +321,7 @@ public virtual ServiceEndpointPoliciesDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -355,7 +355,7 @@ public virtual async Task<ServiceEndpointPoliciesCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual ServiceEndpointPoliciesCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPoliciesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesRestOperations.cs
index da5178b2026d4..6d0955af6040b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ServiceEndpointPoliciesRestClient
+    internal partial class ServiceEndpointPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceEndpointPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceEndpointPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceEndpointPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsOperations.cs
index 53a2c11000319..4c0b8318df92c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ServiceEndpointPolicyDefinitions service client. </summary>
-    public partial class ServiceEndpointPolicyDefinitionsClient
+    public partial class ServiceEndpointPolicyDefinitionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceEndpointPolicyDefinitionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsClient for mocking. </summary>
-        protected ServiceEndpointPolicyDefinitionsClient()
+        internal ServiceEndpointPolicyDefinitionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsOperations for mocking. </summary>
+        protected ServiceEndpointPolicyDefinitionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceEndpointPolicyDefinitionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceEndpointPolicyDefinitionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceEndpointPolicyDefinitionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceEndpointPolicyDefinitionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal ServiceEndpointPolicyDefinitionsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceEndpointPolicyDefinition>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<ServiceEndpointPolicyDefinition>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceEndpointPolicyDefinition> Get(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<ServiceEndpointPolicyDefinition> ListByResourceGrou
 
             async Task<Page<ServiceEndpointPolicyDefinition>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<ServiceEndpointPolicyDefinition>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<ServiceEndpointPolicyDefinition>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<ServiceEndpointPolicyDefinition> ListByResourceGroup(str
 
             Page<ServiceEndpointPolicyDefinition> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<ServiceEndpointPolicyDefinition> FirstPageFunc(int? pageSizeHint)
             }
             Page<ServiceEndpointPolicyDefinition> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<ServiceEndpointPolicyDefinitionsDeleteOperation> Start
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual ServiceEndpointPolicyDefinitionsDeleteOperation StartDelete(strin
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<ServiceEndpointPolicyDefinitionsCreateOrUpdateOperatio
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitions));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation StartCrea
                 throw new ArgumentNullException(nameof(serviceEndpointPolicyDefinitions));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ServiceEndpointPolicyDefinitionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsRestOperations.cs
index 5286939afa80c..f85875916c92e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceEndpointPolicyDefinitionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ServiceEndpointPolicyDefinitionsRestClient
+    internal partial class ServiceEndpointPolicyDefinitionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceEndpointPolicyDefinitionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceEndpointPolicyDefinitionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceEndpointPolicyDefinitionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceOperations.cs
index 13e11b1a72edf..313055328c19e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The Service service client. </summary>
-    public partial class ServiceClient
+    public partial class ServiceOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceClient for mocking. </summary>
-        protected ServiceClient()
+        internal ServiceRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceOperations for mocking. </summary>
+        protected ServiceOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceClient. </summary>
+        /// <summary> Initializes a new instance of ServiceOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ServiceClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DnsNameAvailabilityResult>> CheckDnsNameAvailabilityAsync(string location, string domainNameLabel, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.CheckDnsNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.CheckDnsNameAvailability");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<DnsNameAvailabilityResult>> CheckDnsNameAvail
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DnsNameAvailabilityResult> CheckDnsNameAvailability(string location, string domainNameLabel, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.CheckDnsNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.CheckDnsNameAvailability");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<DnsNameAvailabilityResult> CheckDnsNameAvailability(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualWanSecurityProviders>> SupportedSecurityProvidersAsync(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.SupportedSecurityProviders");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.SupportedSecurityProviders");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<VirtualWanSecurityProviders>> SupportedSecuri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualWanSecurityProviders> SupportedSecurityProviders(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.SupportedSecurityProviders");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.SupportedSecurityProviders");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual AsyncPageable<BastionShareableLink> GetBastionShareableLinkAsync(
 
             async Task<Page<BastionShareableLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -150,7 +150,7 @@ async Task<Page<BastionShareableLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionShareableLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -188,7 +188,7 @@ public virtual Pageable<BastionShareableLink> GetBastionShareableLink(string res
 
             Page<BastionShareableLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -203,7 +203,7 @@ Page<BastionShareableLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionShareableLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.GetBastionShareableLink");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.GetBastionShareableLink");
                 scope.Start();
                 try
                 {
@@ -241,7 +241,7 @@ public virtual AsyncPageable<BastionSessionState> DisconnectActiveSessionsAsync(
 
             async Task<Page<BastionSessionState>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -256,7 +256,7 @@ async Task<Page<BastionSessionState>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<BastionSessionState>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -294,7 +294,7 @@ public virtual Pageable<BastionSessionState> DisconnectActiveSessions(string res
 
             Page<BastionSessionState> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -309,7 +309,7 @@ Page<BastionSessionState> FirstPageFunc(int? pageSizeHint)
             }
             Page<BastionSessionState> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ServiceClient.DisconnectActiveSessions");
+                using var scope = _clientDiagnostics.CreateScope("ServiceOperations.DisconnectActiveSessions");
                 scope.Start();
                 try
                 {
@@ -345,7 +345,7 @@ public virtual async Task<ServicePutBastionShareableLinkOperation> StartPutBasti
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartPutBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartPutBastionShareableLink");
             scope.Start();
             try
             {
@@ -379,7 +379,7 @@ public virtual ServicePutBastionShareableLinkOperation StartPutBastionShareableL
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartPutBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartPutBastionShareableLink");
             scope.Start();
             try
             {
@@ -413,7 +413,7 @@ public virtual async Task<ServiceDeleteBastionShareableLinkOperation> StartDelet
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartDeleteBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartDeleteBastionShareableLink");
             scope.Start();
             try
             {
@@ -447,7 +447,7 @@ public virtual ServiceDeleteBastionShareableLinkOperation StartDeleteBastionShar
                 throw new ArgumentNullException(nameof(bslRequest));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartDeleteBastionShareableLink");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartDeleteBastionShareableLink");
             scope.Start();
             try
             {
@@ -476,7 +476,7 @@ public virtual async Task<ServiceGetActiveSessionsOperation> StartGetActiveSessi
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGetActiveSessions");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGetActiveSessions");
             scope.Start();
             try
             {
@@ -505,7 +505,7 @@ public virtual ServiceGetActiveSessionsOperation StartGetActiveSessions(string r
                 throw new ArgumentNullException(nameof(bastionHostName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGetActiveSessions");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGetActiveSessions");
             scope.Start();
             try
             {
@@ -539,7 +539,7 @@ public virtual async Task<ServiceGeneratevirtualwanvpnserverconfigurationvpnprof
                 throw new ArgumentNullException(nameof(vpnClientParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
             scope.Start();
             try
             {
@@ -573,7 +573,7 @@ public virtual ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperatio
                 throw new ArgumentNullException(nameof(vpnClientParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ServiceClient.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
+            using var scope = _clientDiagnostics.CreateScope("ServiceOperations.StartGeneratevirtualwanvpnserverconfigurationvpnprofile");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceRestOperations.cs
index 9aac63d562392..ad16d4134c352 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ServiceRestClient
+    internal partial class ServiceRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsOperations.cs
similarity index 82%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsOperations.cs
index d925d27f0f078..e4cbc5fb05575 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The ServiceTags service client. </summary>
-    public partial class ServiceTagsClient
+    public partial class ServiceTagsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ServiceTagsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ServiceTagsClient for mocking. </summary>
-        protected ServiceTagsClient()
+        internal ServiceTagsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ServiceTagsOperations for mocking. </summary>
+        protected ServiceTagsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ServiceTagsClient. </summary>
+        /// <summary> Initializes a new instance of ServiceTagsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal ServiceTagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal ServiceTagsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new ServiceTagsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new ServiceTagsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -41,7 +41,7 @@ internal ServiceTagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ServiceTagsListResult>> ListAsync(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceTagsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceTagsOperations.List");
             scope.Start();
             try
             {
@@ -59,7 +59,7 @@ public virtual async Task<Response<ServiceTagsListResult>> ListAsync(string loca
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ServiceTagsListResult> List(string location, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ServiceTagsClient.List");
+            using var scope = _clientDiagnostics.CreateScope("ServiceTagsOperations.List");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsRestOperations.cs
index bfa08f262151c..228fe8a0dab6c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/ServiceTagsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class ServiceTagsRestClient
+    internal partial class ServiceTagsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ServiceTagsRestClient. </summary>
+        /// <summary> Initializes a new instance of ServiceTagsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ServiceTagsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public ServiceTagsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsOperations.cs
index 40cbc99be2d69..70ef75ce6cfab 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The Subnets service client. </summary>
-    public partial class SubnetsClient
+    public partial class SubnetsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SubnetsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SubnetsClient for mocking. </summary>
-        protected SubnetsClient()
+        internal SubnetsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SubnetsOperations for mocking. </summary>
+        protected SubnetsOperations()
         {
         }
-        /// <summary> Initializes a new instance of SubnetsClient. </summary>
+        /// <summary> Initializes a new instance of SubnetsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal SubnetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal SubnetsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new SubnetsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new SubnetsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal SubnetsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Subnet>> GetAsync(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.Get");
             scope.Start();
             try
             {
@@ -66,7 +66,7 @@ public virtual async Task<Response<Subnet>> GetAsync(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Subnet> Get(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<Subnet> ListAsync(string resourceGroupName, string
 
             async Task<Page<Subnet>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<Subnet>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Subnet>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -144,7 +144,7 @@ public virtual Pageable<Subnet> List(string resourceGroupName, string virtualNet
 
             Page<Subnet> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -159,7 +159,7 @@ Page<Subnet> FirstPageFunc(int? pageSizeHint)
             }
             Page<Subnet> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SubnetsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.List");
                 scope.Start();
                 try
                 {
@@ -195,7 +195,7 @@ public virtual async Task<SubnetsDeleteOperation> StartDeleteAsync(string resour
                 throw new ArgumentNullException(nameof(subnetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -229,7 +229,7 @@ public virtual SubnetsDeleteOperation StartDelete(string resourceGroupName, stri
                 throw new ArgumentNullException(nameof(subnetName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -268,7 +268,7 @@ public virtual async Task<SubnetsCreateOrUpdateOperation> StartCreateOrUpdateAsy
                 throw new ArgumentNullException(nameof(subnetParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -307,7 +307,7 @@ public virtual SubnetsCreateOrUpdateOperation StartCreateOrUpdate(string resourc
                 throw new ArgumentNullException(nameof(subnetParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -346,7 +346,7 @@ public virtual async Task<SubnetsPrepareNetworkPoliciesOperation> StartPrepareNe
                 throw new ArgumentNullException(nameof(prepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartPrepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartPrepareNetworkPolicies");
             scope.Start();
             try
             {
@@ -385,7 +385,7 @@ public virtual SubnetsPrepareNetworkPoliciesOperation StartPrepareNetworkPolicie
                 throw new ArgumentNullException(nameof(prepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartPrepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartPrepareNetworkPolicies");
             scope.Start();
             try
             {
@@ -424,7 +424,7 @@ public virtual async Task<SubnetsUnprepareNetworkPoliciesOperation> StartUnprepa
                 throw new ArgumentNullException(nameof(unprepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartUnprepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartUnprepareNetworkPolicies");
             scope.Start();
             try
             {
@@ -463,7 +463,7 @@ public virtual SubnetsUnprepareNetworkPoliciesOperation StartUnprepareNetworkPol
                 throw new ArgumentNullException(nameof(unprepareNetworkPoliciesRequestParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("SubnetsClient.StartUnprepareNetworkPolicies");
+            using var scope = _clientDiagnostics.CreateScope("SubnetsOperations.StartUnprepareNetworkPolicies");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsRestOperations.cs
index 9eedc4ef9e57a..c4714ecb42c1e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/SubnetsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class SubnetsRestClient
+    internal partial class SubnetsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SubnetsRestClient. </summary>
+        /// <summary> Initializes a new instance of SubnetsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SubnetsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public SubnetsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesOperations.cs
similarity index 87%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesOperations.cs
index 88b98bfdc802a..a8c03cec6af1d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The Usages service client. </summary>
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsagesClient for mocking. </summary>
-        protected UsagesClient()
+        internal UsagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsagesOperations for mocking. </summary>
+        protected UsagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsagesClient. </summary>
+        /// <summary> Initializes a new instance of UsagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal UsagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal UsagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new UsagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new UsagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual AsyncPageable<Usage> ListAsync(string location, CancellationToken
 
             async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -64,7 +64,7 @@ async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Usage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -92,7 +92,7 @@ public virtual Pageable<Usage> List(string location, CancellationToken cancellat
 
             Page<Usage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
@@ -107,7 +107,7 @@ Page<Usage> FirstPageFunc(int? pageSizeHint)
             }
             Page<Usage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesRestOperations.cs
similarity index 97%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesRestOperations.cs
index c24359f638ddd..593ad4218eedb 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/UsagesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class UsagesRestClient
+    internal partial class UsagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsagesRestClient. </summary>
+        /// <summary> Initializes a new instance of UsagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public UsagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SOperations.cs
index e6ae05939cadc..3c79f5b9fde3d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualHubRouteTableV2S service client. </summary>
-    public partial class VirtualHubRouteTableV2SClient
+    public partial class VirtualHubRouteTableV2SOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualHubRouteTableV2SRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SClient for mocking. </summary>
-        protected VirtualHubRouteTableV2SClient()
+        internal VirtualHubRouteTableV2SRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SOperations for mocking. </summary>
+        protected VirtualHubRouteTableV2SOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualHubRouteTableV2SClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualHubRouteTableV2SOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualHubRouteTableV2SRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualHubRouteTableV2SRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualHubRouteTableV2SClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualHubRouteTableV2>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualHubRouteTableV2>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualHubRouteTableV2> Get(string resourceGroupName, string virtualHubName, string routeTableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VirtualHubRouteTableV2> ListAsync(string resourceGr
 
             async Task<Page<VirtualHubRouteTableV2>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VirtualHubRouteTableV2>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualHubRouteTableV2>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VirtualHubRouteTableV2> List(string resourceGroupName, s
 
             Page<VirtualHubRouteTableV2> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VirtualHubRouteTableV2> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualHubRouteTableV2> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.List");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<VirtualHubRouteTableV2SCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(virtualHubRouteTableV2Parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual VirtualHubRouteTableV2SCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(virtualHubRouteTableV2Parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<VirtualHubRouteTableV2SDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VirtualHubRouteTableV2SDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(routeTableName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubRouteTableV2SOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SRestOperations.cs
index 448e415cc06f8..d357d0fdef120 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubRouteTableV2SRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualHubRouteTableV2SRestClient
+    internal partial class VirtualHubRouteTableV2SRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubRouteTableV2SRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualHubRouteTableV2SRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualHubRouteTableV2SRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsOperations.cs
index 8f61997e2adf7..537c187a73025 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualHubs service client. </summary>
-    public partial class VirtualHubsClient
+    public partial class VirtualHubsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualHubsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualHubsClient for mocking. </summary>
-        protected VirtualHubsClient()
+        internal VirtualHubsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualHubsOperations for mocking. </summary>
+        protected VirtualHubsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualHubsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualHubsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualHubsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualHubsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualHubsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualHubsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualHub>> GetAsync(string resourceGroupName, string virtualHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualHub>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualHub> Get(string resourceGroupName, string virtualHubName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VirtualHub> Get(string resourceGroupName, string virtual
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualHub>> UpdateTagsAsync(string resourceGroupName, string virtualHubName, TagsObject virtualHubParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VirtualHub>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualHub> UpdateTags(string resourceGroupName, string virtualHubName, TagsObject virtualHubParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VirtualHub> ListByResourceGroupAsync(string resourc
 
             async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualHub>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VirtualHub> ListByResourceGroup(string resourceGroupName
 
             Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualHub> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VirtualHub> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VirtualHub>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualHub>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualHub> List(CancellationToken cancellationToken = d
         {
             Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualHub> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualHub> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VirtualHubsCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(virtualHubParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VirtualHubsCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(virtualHubParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VirtualHubsDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(virtualHubName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VirtualHubsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(virtualHubName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualHubsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualHubsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsRestOperations.cs
index 4cd7c592e2193..7f56a5ebd9051 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualHubsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualHubsRestClient
+    internal partial class VirtualHubsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualHubsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualHubsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualHubsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualHubsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsOperations.cs
index 70248053b7a38..9505dcda7ed3f 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualNetworkGatewayConnections service client. </summary>
-    public partial class VirtualNetworkGatewayConnectionsClient
+    public partial class VirtualNetworkGatewayConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkGatewayConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsClient for mocking. </summary>
-        protected VirtualNetworkGatewayConnectionsClient()
+        internal VirtualNetworkGatewayConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsOperations for mocking. </summary>
+        protected VirtualNetworkGatewayConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkGatewayConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkGatewayConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkGatewayConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkGatewayConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualNetworkGatewayConnectionsClient(ClientDiagnostics clientDiagnost
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkGatewayConnection>> GetAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualNetworkGatewayConnection>> GetAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkGatewayConnection> Get(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualNetworkGatewayConnection> Get(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ConnectionSharedKey>> GetSharedKeyAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.GetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.GetSharedKey");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<ConnectionSharedKey>> GetSharedKeyAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ConnectionSharedKey> GetSharedKey(string resourceGroupName, string virtualNetworkGatewayConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.GetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.GetSharedKey");
             scope.Start();
             try
             {
@@ -125,7 +125,7 @@ public virtual AsyncPageable<VirtualNetworkGatewayConnection> ListAsync(string r
 
             async Task<Page<VirtualNetworkGatewayConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -140,7 +140,7 @@ async Task<Page<VirtualNetworkGatewayConnection>> FirstPageFunc(int? pageSizeHin
             }
             async Task<Page<VirtualNetworkGatewayConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -168,7 +168,7 @@ public virtual Pageable<VirtualNetworkGatewayConnection> List(string resourceGro
 
             Page<VirtualNetworkGatewayConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -183,7 +183,7 @@ Page<VirtualNetworkGatewayConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkGatewayConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -219,7 +219,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsCreateOrUpdateOperatio
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -253,7 +253,7 @@ public virtual VirtualNetworkGatewayConnectionsCreateOrUpdateOperation StartCrea
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -282,7 +282,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsDeleteOperation> Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -311,7 +311,7 @@ public virtual VirtualNetworkGatewayConnectionsDeleteOperation StartDelete(strin
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -345,7 +345,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsUpdateTagsOperation> S
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -379,7 +379,7 @@ public virtual VirtualNetworkGatewayConnectionsUpdateTagsOperation StartUpdateTa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -413,7 +413,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsSetSharedKeyOperation>
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartSetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartSetSharedKey");
             scope.Start();
             try
             {
@@ -447,7 +447,7 @@ public virtual VirtualNetworkGatewayConnectionsSetSharedKeyOperation StartSetSha
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartSetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartSetSharedKey");
             scope.Start();
             try
             {
@@ -481,7 +481,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsResetSharedKeyOperatio
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartResetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartResetSharedKey");
             scope.Start();
             try
             {
@@ -515,7 +515,7 @@ public virtual VirtualNetworkGatewayConnectionsResetSharedKeyOperation StartRese
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartResetSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartResetSharedKey");
             scope.Start();
             try
             {
@@ -545,7 +545,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsStartPacketCaptureOper
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -575,7 +575,7 @@ public virtual VirtualNetworkGatewayConnectionsStartPacketCaptureOperation Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayConnectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -609,7 +609,7 @@ public virtual async Task<VirtualNetworkGatewayConnectionsStopPacketCaptureOpera
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
@@ -643,7 +643,7 @@ public virtual VirtualNetworkGatewayConnectionsStopPacketCaptureOperation StartS
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewayConnectionsOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsRestOperations.cs
index 4c0f50b735142..8cc844a1ee1b1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewayConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualNetworkGatewayConnectionsRestClient
+    internal partial class VirtualNetworkGatewayConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewayConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkGatewayConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkGatewayConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysOperations.cs
index 96cdff6e33e96..db3369a93205d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualNetworkGateways service client. </summary>
-    public partial class VirtualNetworkGatewaysClient
+    public partial class VirtualNetworkGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewaysClient for mocking. </summary>
-        protected VirtualNetworkGatewaysClient()
+        internal VirtualNetworkGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkGatewaysOperations for mocking. </summary>
+        protected VirtualNetworkGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualNetworkGatewaysClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkGateway>> GetAsync(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualNetworkGateway>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkGateway> Get(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -81,7 +81,7 @@ public virtual Response<VirtualNetworkGateway> Get(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<string>> SupportedVpnDevicesAsync(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.SupportedVpnDevices");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.SupportedVpnDevices");
             scope.Start();
             try
             {
@@ -100,7 +100,7 @@ public virtual async Task<Response<string>> SupportedVpnDevicesAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<string> SupportedVpnDevices(string resourceGroupName, string virtualNetworkGatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.SupportedVpnDevices");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.SupportedVpnDevices");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<string> SupportedVpnDevices(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<string>> VpnDeviceConfigurationScriptAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.VpnDeviceConfigurationScript");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.VpnDeviceConfigurationScript");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<string>> VpnDeviceConfigurationScriptAsync(st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<string> VpnDeviceConfigurationScript(string resourceGroupName, string virtualNetworkGatewayConnectionName, VpnDeviceScriptParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.VpnDeviceConfigurationScript");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.VpnDeviceConfigurationScript");
             scope.Start();
             try
             {
@@ -165,7 +165,7 @@ public virtual AsyncPageable<VirtualNetworkGateway> ListAsync(string resourceGro
 
             async Task<Page<VirtualNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -180,7 +180,7 @@ async Task<Page<VirtualNetworkGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -208,7 +208,7 @@ public virtual Pageable<VirtualNetworkGateway> List(string resourceGroupName, Ca
 
             Page<VirtualNetworkGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -223,7 +223,7 @@ Page<VirtualNetworkGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -256,7 +256,7 @@ public virtual AsyncPageable<VirtualNetworkGatewayConnectionListEntity> ListConn
 
             async Task<Page<VirtualNetworkGatewayConnectionListEntity>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -271,7 +271,7 @@ async Task<Page<VirtualNetworkGatewayConnectionListEntity>> FirstPageFunc(int? p
             }
             async Task<Page<VirtualNetworkGatewayConnectionListEntity>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -304,7 +304,7 @@ public virtual Pageable<VirtualNetworkGatewayConnectionListEntity> ListConnectio
 
             Page<VirtualNetworkGatewayConnectionListEntity> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -319,7 +319,7 @@ Page<VirtualNetworkGatewayConnectionListEntity> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkGatewayConnectionListEntity> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.ListConnections");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.ListConnections");
                 scope.Start();
                 try
                 {
@@ -355,7 +355,7 @@ public virtual async Task<VirtualNetworkGatewaysCreateOrUpdateOperation> StartCr
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -389,7 +389,7 @@ public virtual VirtualNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -418,7 +418,7 @@ public virtual async Task<VirtualNetworkGatewaysDeleteOperation> StartDeleteAsyn
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -447,7 +447,7 @@ public virtual VirtualNetworkGatewaysDeleteOperation StartDelete(string resource
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -481,7 +481,7 @@ public virtual async Task<VirtualNetworkGatewaysUpdateTagsOperation> StartUpdate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -515,7 +515,7 @@ public virtual VirtualNetworkGatewaysUpdateTagsOperation StartUpdateTags(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartUpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartUpdateTags");
             scope.Start();
             try
             {
@@ -545,7 +545,7 @@ public virtual async Task<VirtualNetworkGatewaysResetOperation> StartResetAsync(
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartReset");
             scope.Start();
             try
             {
@@ -575,7 +575,7 @@ public virtual VirtualNetworkGatewaysResetOperation StartReset(string resourceGr
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartReset");
             scope.Start();
             try
             {
@@ -604,7 +604,7 @@ public virtual async Task<VirtualNetworkGatewaysResetVpnClientSharedKeyOperation
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartResetVpnClientSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartResetVpnClientSharedKey");
             scope.Start();
             try
             {
@@ -633,7 +633,7 @@ public virtual VirtualNetworkGatewaysResetVpnClientSharedKeyOperation StartReset
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartResetVpnClientSharedKey");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartResetVpnClientSharedKey");
             scope.Start();
             try
             {
@@ -667,7 +667,7 @@ public virtual async Task<VirtualNetworkGatewaysGeneratevpnclientpackageOperatio
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGeneratevpnclientpackage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGeneratevpnclientpackage");
             scope.Start();
             try
             {
@@ -701,7 +701,7 @@ public virtual VirtualNetworkGatewaysGeneratevpnclientpackageOperation StartGene
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGeneratevpnclientpackage");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGeneratevpnclientpackage");
             scope.Start();
             try
             {
@@ -735,7 +735,7 @@ public virtual async Task<VirtualNetworkGatewaysGenerateVpnProfileOperation> Sta
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -769,7 +769,7 @@ public virtual VirtualNetworkGatewaysGenerateVpnProfileOperation StartGenerateVp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGenerateVpnProfile");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGenerateVpnProfile");
             scope.Start();
             try
             {
@@ -798,7 +798,7 @@ public virtual async Task<VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnProfilePackageUrl");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnProfilePackageUrl");
             scope.Start();
             try
             {
@@ -827,7 +827,7 @@ public virtual VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation StartGetVp
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnProfilePackageUrl");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnProfilePackageUrl");
             scope.Start();
             try
             {
@@ -857,7 +857,7 @@ public virtual async Task<VirtualNetworkGatewaysGetBgpPeerStatusOperation> Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetBgpPeerStatus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetBgpPeerStatus");
             scope.Start();
             try
             {
@@ -887,7 +887,7 @@ public virtual VirtualNetworkGatewaysGetBgpPeerStatusOperation StartGetBgpPeerSt
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetBgpPeerStatus");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetBgpPeerStatus");
             scope.Start();
             try
             {
@@ -916,7 +916,7 @@ public virtual async Task<VirtualNetworkGatewaysGetLearnedRoutesOperation> Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetLearnedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetLearnedRoutes");
             scope.Start();
             try
             {
@@ -945,7 +945,7 @@ public virtual VirtualNetworkGatewaysGetLearnedRoutesOperation StartGetLearnedRo
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetLearnedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetLearnedRoutes");
             scope.Start();
             try
             {
@@ -979,7 +979,7 @@ public virtual async Task<VirtualNetworkGatewaysGetAdvertisedRoutesOperation> St
                 throw new ArgumentNullException(nameof(peer));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetAdvertisedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetAdvertisedRoutes");
             scope.Start();
             try
             {
@@ -1013,7 +1013,7 @@ public virtual VirtualNetworkGatewaysGetAdvertisedRoutesOperation StartGetAdvert
                 throw new ArgumentNullException(nameof(peer));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetAdvertisedRoutes");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetAdvertisedRoutes");
             scope.Start();
             try
             {
@@ -1047,7 +1047,7 @@ public virtual async Task<VirtualNetworkGatewaysSetVpnclientIpsecParametersOpera
                 throw new ArgumentNullException(nameof(vpnclientIpsecParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartSetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartSetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1081,7 +1081,7 @@ public virtual VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation StartS
                 throw new ArgumentNullException(nameof(vpnclientIpsecParams));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartSetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartSetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1110,7 +1110,7 @@ public virtual async Task<VirtualNetworkGatewaysGetVpnclientIpsecParametersOpera
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1139,7 +1139,7 @@ public virtual VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation StartG
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientIpsecParameters");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientIpsecParameters");
             scope.Start();
             try
             {
@@ -1169,7 +1169,7 @@ public virtual async Task<VirtualNetworkGatewaysStartPacketCaptureOperation> Sta
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -1199,7 +1199,7 @@ public virtual VirtualNetworkGatewaysStartPacketCaptureOperation StartStartPacke
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStartPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStartPacketCapture");
             scope.Start();
             try
             {
@@ -1233,7 +1233,7 @@ public virtual async Task<VirtualNetworkGatewaysStopPacketCaptureOperation> Star
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
@@ -1267,7 +1267,7 @@ public virtual VirtualNetworkGatewaysStopPacketCaptureOperation StartStopPacketC
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartStopPacketCapture");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartStopPacketCapture");
             scope.Start();
             try
             {
@@ -1296,7 +1296,7 @@ public virtual async Task<VirtualNetworkGatewaysGetVpnclientConnectionHealthOper
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientConnectionHealth");
             scope.Start();
             try
             {
@@ -1325,7 +1325,7 @@ public virtual VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation Start
                 throw new ArgumentNullException(nameof(virtualNetworkGatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartGetVpnclientConnectionHealth");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartGetVpnclientConnectionHealth");
             scope.Start();
             try
             {
@@ -1359,7 +1359,7 @@ public virtual async Task<VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayV
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDisconnectVirtualNetworkGatewayVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDisconnectVirtualNetworkGatewayVpnConnections");
             scope.Start();
             try
             {
@@ -1393,7 +1393,7 @@ public virtual VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectio
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysClient.StartDisconnectVirtualNetworkGatewayVpnConnections");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkGatewaysOperations.StartDisconnectVirtualNetworkGatewayVpnConnections");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysRestOperations.cs
index d446fd95e44d3..fac89431d64e6 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualNetworkGatewaysRestClient
+    internal partial class VirtualNetworkGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsOperations.cs
index 8e099e1a0dd2d..d96101c8ac408 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualNetworkPeerings service client. </summary>
-    public partial class VirtualNetworkPeeringsClient
+    public partial class VirtualNetworkPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkPeeringsClient for mocking. </summary>
-        protected VirtualNetworkPeeringsClient()
+        internal VirtualNetworkPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkPeeringsOperations for mocking. </summary>
+        protected VirtualNetworkPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualNetworkPeeringsClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkPeering>> GetAsync(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualNetworkPeering>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkPeering> Get(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VirtualNetworkPeering> ListAsync(string resourceGro
 
             async Task<Page<VirtualNetworkPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VirtualNetworkPeering>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VirtualNetworkPeering> List(string resourceGroupName, st
 
             Page<VirtualNetworkPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VirtualNetworkPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<VirtualNetworkPeeringsDeleteOperation> StartDeleteAsyn
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual VirtualNetworkPeeringsDeleteOperation StartDelete(string resource
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<VirtualNetworkPeeringsCreateOrUpdateOperation> StartCr
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VirtualNetworkPeeringsCreateOrUpdateOperation StartCreateOrUpdate
                 throw new ArgumentNullException(nameof(virtualNetworkPeeringParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsRestOperations.cs
index bf00ce5dc5488..a5a24b7252a77 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualNetworkPeeringsRestClient
+    internal partial class VirtualNetworkPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsOperations.cs
index b1a23e520801f..181fdbbcef048 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualNetworkTaps service client. </summary>
-    public partial class VirtualNetworkTapsClient
+    public partial class VirtualNetworkTapsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworkTapsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworkTapsClient for mocking. </summary>
-        protected VirtualNetworkTapsClient()
+        internal VirtualNetworkTapsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworkTapsOperations for mocking. </summary>
+        protected VirtualNetworkTapsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworkTapsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkTapsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworkTapsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworkTapsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworkTapsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworkTapsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualNetworkTapsClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkTap>> GetAsync(string resourceGroupName, string tapName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualNetworkTap>> GetAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkTap> Get(string resourceGroupName, string tapName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VirtualNetworkTap> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetworkTap>> UpdateTagsAsync(string resourceGroupName, string tapName, TagsObject tapParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VirtualNetworkTap>> UpdateTagsAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetworkTap> UpdateTags(string resourceGroupName, string tapName, TagsObject tapParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual AsyncPageable<VirtualNetworkTap> ListAllAsync(CancellationToken c
         {
             async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -136,7 +136,7 @@ async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkTap>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -158,7 +158,7 @@ public virtual Pageable<VirtualNetworkTap> ListAll(CancellationToken cancellatio
         {
             Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -173,7 +173,7 @@ Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkTap> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -201,7 +201,7 @@ public virtual AsyncPageable<VirtualNetworkTap> ListByResourceGroupAsync(string
 
             async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -216,7 +216,7 @@ async Task<Page<VirtualNetworkTap>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkTap>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualNetworkTap> ListByResourceGroup(string resourceGr
 
             Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualNetworkTap> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkTap> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<VirtualNetworkTapsDeleteOperation> StartDeleteAsync(st
                 throw new ArgumentNullException(nameof(tapName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual VirtualNetworkTapsDeleteOperation StartDelete(string resourceGrou
                 throw new ArgumentNullException(nameof(tapName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -353,7 +353,7 @@ public virtual async Task<VirtualNetworkTapsCreateOrUpdateOperation> StartCreate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VirtualNetworkTapsCreateOrUpdateOperation StartCreateOrUpdate(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworkTapsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsRestOperations.cs
index a9f2b62529d50..1d7df3c787519 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworkTapsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualNetworkTapsRestClient
+    internal partial class VirtualNetworkTapsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworkTapsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworkTapsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworkTapsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworkTapsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksOperations.cs
index 6830e579ba243..7ad84593404b6 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualNetworks service client. </summary>
-    public partial class VirtualNetworksClient
+    public partial class VirtualNetworksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualNetworksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualNetworksClient for mocking. </summary>
-        protected VirtualNetworksClient()
+        internal VirtualNetworksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualNetworksOperations for mocking. </summary>
+        protected VirtualNetworksOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualNetworksClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualNetworksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualNetworksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualNetworksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualNetworksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualNetworksClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetwork>> GetAsync(string resourceGroupName, string virtualNetworkName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualNetwork>> GetAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetwork> Get(string resourceGroupName, string virtualNetworkName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.Get");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<VirtualNetwork> Get(string resourceGroupName, string vir
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualNetwork>> UpdateTagsAsync(string resourceGroupName, string virtualNetworkName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -104,7 +104,7 @@ public virtual async Task<Response<VirtualNetwork>> UpdateTagsAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualNetwork> UpdateTags(string resourceGroupName, string virtualNetworkName, TagsObject parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -124,7 +124,7 @@ public virtual Response<VirtualNetwork> UpdateTags(string resourceGroupName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<IPAddressAvailabilityResult>> CheckIPAddressAvailabilityAsync(string resourceGroupName, string virtualNetworkName, string ipAddress, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.CheckIPAddressAvailability");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.CheckIPAddressAvailability");
             scope.Start();
             try
             {
@@ -144,7 +144,7 @@ public virtual async Task<Response<IPAddressAvailabilityResult>> CheckIPAddressA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<IPAddressAvailabilityResult> CheckIPAddressAvailability(string resourceGroupName, string virtualNetworkName, string ipAddress, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.CheckIPAddressAvailability");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.CheckIPAddressAvailability");
             scope.Start();
             try
             {
@@ -163,7 +163,7 @@ public virtual AsyncPageable<VirtualNetwork> ListAllAsync(CancellationToken canc
         {
             async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -178,7 +178,7 @@ async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetwork>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -200,7 +200,7 @@ public virtual Pageable<VirtualNetwork> ListAll(CancellationToken cancellationTo
         {
             Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -215,7 +215,7 @@ Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetwork> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -243,7 +243,7 @@ public virtual AsyncPageable<VirtualNetwork> ListAsync(string resourceGroupName,
 
             async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -258,7 +258,7 @@ async Task<Page<VirtualNetwork>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetwork>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ public virtual Pageable<VirtualNetwork> List(string resourceGroupName, Cancellat
 
             Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -301,7 +301,7 @@ Page<VirtualNetwork> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetwork> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.List");
                 scope.Start();
                 try
                 {
@@ -334,7 +334,7 @@ public virtual AsyncPageable<VirtualNetworkUsage> ListUsageAsync(string resource
 
             async Task<Page<VirtualNetworkUsage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -349,7 +349,7 @@ async Task<Page<VirtualNetworkUsage>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualNetworkUsage>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -382,7 +382,7 @@ public virtual Pageable<VirtualNetworkUsage> ListUsage(string resourceGroupName,
 
             Page<VirtualNetworkUsage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -397,7 +397,7 @@ Page<VirtualNetworkUsage> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualNetworkUsage> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.ListUsage");
+                using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.ListUsage");
                 scope.Start();
                 try
                 {
@@ -428,7 +428,7 @@ public virtual async Task<VirtualNetworksDeleteOperation> StartDeleteAsync(strin
                 throw new ArgumentNullException(nameof(virtualNetworkName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -457,7 +457,7 @@ public virtual VirtualNetworksDeleteOperation StartDelete(string resourceGroupNa
                 throw new ArgumentNullException(nameof(virtualNetworkName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartDelete");
             scope.Start();
             try
             {
@@ -491,7 +491,7 @@ public virtual async Task<VirtualNetworksCreateOrUpdateOperation> StartCreateOrU
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -525,7 +525,7 @@ public virtual VirtualNetworksCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualNetworksOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksRestOperations.cs
index d7fb20286e4d0..425931b52ac7d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualNetworksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualNetworksRestClient
+    internal partial class VirtualNetworksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualNetworksRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualNetworksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualNetworksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualNetworksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsOperations.cs
index 8c587ea9af220..489d134c26bf0 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualRouterPeerings service client. </summary>
-    public partial class VirtualRouterPeeringsClient
+    public partial class VirtualRouterPeeringsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualRouterPeeringsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualRouterPeeringsClient for mocking. </summary>
-        protected VirtualRouterPeeringsClient()
+        internal VirtualRouterPeeringsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualRouterPeeringsOperations for mocking. </summary>
+        protected VirtualRouterPeeringsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualRouterPeeringsClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRouterPeeringsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualRouterPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualRouterPeeringsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualRouterPeeringsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualRouterPeeringsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualRouterPeeringsClient(ClientDiagnostics clientDiagnostics, HttpPi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualRouterPeering>> GetAsync(string resourceGroupName, string virtualRouterName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualRouterPeering>> GetAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualRouterPeering> Get(string resourceGroupName, string virtualRouterName, string peeringName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VirtualRouterPeering> ListAsync(string resourceGrou
 
             async Task<Page<VirtualRouterPeering>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VirtualRouterPeering>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualRouterPeering>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VirtualRouterPeering> List(string resourceGroupName, str
 
             Page<VirtualRouterPeering> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VirtualRouterPeering> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualRouterPeering> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.List");
                 scope.Start();
                 try
                 {
@@ -193,7 +193,7 @@ public virtual async Task<VirtualRouterPeeringsDeleteOperation> StartDeleteAsync
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -227,7 +227,7 @@ public virtual VirtualRouterPeeringsDeleteOperation StartDelete(string resourceG
                 throw new ArgumentNullException(nameof(peeringName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -266,7 +266,7 @@ public virtual async Task<VirtualRouterPeeringsCreateOrUpdateOperation> StartCre
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VirtualRouterPeeringsCreateOrUpdateOperation StartCreateOrUpdate(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRouterPeeringsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsRestOperations.cs
index b5581c10a8601..3a53eb5a6ec85 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRouterPeeringsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualRouterPeeringsRestClient
+    internal partial class VirtualRouterPeeringsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualRouterPeeringsRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRouterPeeringsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualRouterPeeringsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualRouterPeeringsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersOperations.cs
index 6a8ae9ca51761..f6f2dcc17f980 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualRouters service client. </summary>
-    public partial class VirtualRoutersClient
+    public partial class VirtualRoutersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualRoutersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualRoutersClient for mocking. </summary>
-        protected VirtualRoutersClient()
+        internal VirtualRoutersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualRoutersOperations for mocking. </summary>
+        protected VirtualRoutersOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualRoutersClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRoutersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualRoutersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualRoutersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualRoutersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualRoutersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VirtualRoutersClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualRouter>> GetAsync(string resourceGroupName, string virtualRouterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VirtualRouter>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualRouter> Get(string resourceGroupName, string virtualRouterName, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.Get");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual AsyncPageable<VirtualRouter> ListByResourceGroupAsync(string reso
 
             async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -104,7 +104,7 @@ async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualRouter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -132,7 +132,7 @@ public virtual Pageable<VirtualRouter> ListByResourceGroup(string resourceGroupN
 
             Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -147,7 +147,7 @@ Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualRouter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -169,7 +169,7 @@ public virtual AsyncPageable<VirtualRouter> ListAsync(CancellationToken cancella
         {
             async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -184,7 +184,7 @@ async Task<Page<VirtualRouter>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualRouter>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -206,7 +206,7 @@ public virtual Pageable<VirtualRouter> List(CancellationToken cancellationToken
         {
             Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -221,7 +221,7 @@ Page<VirtualRouter> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualRouter> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.List");
                 scope.Start();
                 try
                 {
@@ -252,7 +252,7 @@ public virtual async Task<VirtualRoutersDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(virtualRouterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -281,7 +281,7 @@ public virtual VirtualRoutersDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(virtualRouterName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartDelete");
             scope.Start();
             try
             {
@@ -315,7 +315,7 @@ public virtual async Task<VirtualRoutersCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -349,7 +349,7 @@ public virtual VirtualRoutersCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualRoutersOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersRestOperations.cs
index 12fdf19db63a9..d827c630732e7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualRoutersRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualRoutersRestClient
+    internal partial class VirtualRoutersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualRoutersRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualRoutersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualRoutersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualRoutersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansOperations.cs
index 9627dc2b55059..4ee15eb91ddb8 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VirtualWans service client. </summary>
-    public partial class VirtualWansClient
+    public partial class VirtualWansOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VirtualWansRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VirtualWansClient for mocking. </summary>
-        protected VirtualWansClient()
+        internal VirtualWansRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VirtualWansOperations for mocking. </summary>
+        protected VirtualWansOperations()
         {
         }
-        /// <summary> Initializes a new instance of VirtualWansClient. </summary>
+        /// <summary> Initializes a new instance of VirtualWansOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VirtualWansClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VirtualWansOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VirtualWansRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VirtualWansRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VirtualWansClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualWAN>> GetAsync(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VirtualWAN>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualWAN> Get(string resourceGroupName, string virtualWANName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VirtualWAN> Get(string resourceGroupName, string virtual
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VirtualWAN>> UpdateTagsAsync(string resourceGroupName, string virtualWANName, TagsObject wANParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VirtualWAN>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VirtualWAN> UpdateTags(string resourceGroupName, string virtualWANName, TagsObject wANParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VirtualWAN> ListByResourceGroupAsync(string resourc
 
             async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualWAN>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VirtualWAN> ListByResourceGroup(string resourceGroupName
 
             Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualWAN> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VirtualWAN> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VirtualWAN>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VirtualWAN>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VirtualWAN> List(CancellationToken cancellationToken = d
         {
             Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VirtualWAN> FirstPageFunc(int? pageSizeHint)
             }
             Page<VirtualWAN> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VirtualWansCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(wANParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VirtualWansCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(wANParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VirtualWansDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VirtualWansDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VirtualWansClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VirtualWansOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansRestOperations.cs
index a95044a9b2616..e8407f175509d 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VirtualWansRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VirtualWansRestClient
+    internal partial class VirtualWansRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VirtualWansRestClient. </summary>
+        /// <summary> Initializes a new instance of VirtualWansRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VirtualWansRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VirtualWansRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsOperations.cs
index 5d4c7edd401d9..67217bcbd084e 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnConnections service client. </summary>
-    public partial class VpnConnectionsClient
+    public partial class VpnConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnConnectionsClient for mocking. </summary>
-        protected VpnConnectionsClient()
+        internal VpnConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnConnectionsOperations for mocking. </summary>
+        protected VpnConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VpnConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VpnConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VpnConnection>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnConnection> Get(string resourceGroupName, string gatewayName, string connectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VpnConnection> ListByVpnGatewayAsync(string resourc
 
             async Task<Page<VpnConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VpnConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VpnConnection> ListByVpnGateway(string resourceGroupName
 
             Page<VpnConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VpnConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.ListByVpnGateway");
+                using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.ListByVpnGateway");
                 scope.Start();
                 try
                 {
@@ -198,7 +198,7 @@ public virtual async Task<VpnConnectionsCreateOrUpdateOperation> StartCreateOrUp
                 throw new ArgumentNullException(nameof(vpnConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual VpnConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string
                 throw new ArgumentNullException(nameof(vpnConnectionParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -271,7 +271,7 @@ public virtual async Task<VpnConnectionsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -305,7 +305,7 @@ public virtual VpnConnectionsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(connectionName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnConnectionsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsRestOperations.cs
index 2b3ddad6352c1..135a7d33b608c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnConnectionsRestClient
+    internal partial class VpnConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysOperations.cs
index 374a8ac591f5c..462ecdb78baa7 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnGateways service client. </summary>
-    public partial class VpnGatewaysClient
+    public partial class VpnGatewaysOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnGatewaysRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnGatewaysClient for mocking. </summary>
-        protected VpnGatewaysClient()
+        internal VpnGatewaysRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnGatewaysOperations for mocking. </summary>
+        protected VpnGatewaysOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnGatewaysClient. </summary>
+        /// <summary> Initializes a new instance of VpnGatewaysOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnGatewaysOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnGatewaysRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnGatewaysRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VpnGatewaysClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnGateway>> GetAsync(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VpnGateway>> GetAsync(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnGateway> Get(string resourceGroupName, string gatewayName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VpnGateway> Get(string resourceGroupName, string gateway
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, TagsObject vpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VpnGateway>> UpdateTagsAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnGateway> UpdateTags(string resourceGroupName, string gatewayName, TagsObject vpnGatewayParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VpnGateway> ListByResourceGroupAsync(string resourc
 
             async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VpnGateway> ListByResourceGroup(string resourceGroupName
 
             Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VpnGateway> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VpnGateway>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnGateway>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VpnGateway> List(CancellationToken cancellationToken = d
         {
             Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VpnGateway> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnGateway> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VpnGatewaysCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(vpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(vpnGatewayParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VpnGatewaysDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VpnGatewaysDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartDelete");
             scope.Start();
             try
             {
@@ -416,7 +416,7 @@ public virtual async Task<VpnGatewaysResetOperation> StartResetAsync(string reso
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartReset");
             scope.Start();
             try
             {
@@ -445,7 +445,7 @@ public virtual VpnGatewaysResetOperation StartReset(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(gatewayName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysClient.StartReset");
+            using var scope = _clientDiagnostics.CreateScope("VpnGatewaysOperations.StartReset");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysRestOperations.cs
index d19e4f351654e..b2c5d2a885028 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnGatewaysRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnGatewaysRestClient
+    internal partial class VpnGatewaysRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnGatewaysRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnGatewaysRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnGatewaysRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnGatewaysRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsOperations.cs
similarity index 89%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsOperations.cs
index fb49c1410e13e..f1d40c0f584ec 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnLinkConnections service client. </summary>
-    public partial class VpnLinkConnectionsClient
+    public partial class VpnLinkConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnLinkConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnLinkConnectionsClient for mocking. </summary>
-        protected VpnLinkConnectionsClient()
+        internal VpnLinkConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnLinkConnectionsOperations for mocking. </summary>
+        protected VpnLinkConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnLinkConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VpnLinkConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnLinkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnLinkConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnLinkConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnLinkConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -59,7 +59,7 @@ public virtual AsyncPageable<VpnSiteLinkConnection> ListByVpnConnectionAsync(str
 
             async Task<Page<VpnSiteLinkConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
@@ -74,7 +74,7 @@ async Task<Page<VpnSiteLinkConnection>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSiteLinkConnection>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
@@ -112,7 +112,7 @@ public virtual Pageable<VpnSiteLinkConnection> ListByVpnConnection(string resour
 
             Page<VpnSiteLinkConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
@@ -127,7 +127,7 @@ Page<VpnSiteLinkConnection> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSiteLinkConnection> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsClient.ListByVpnConnection");
+                using var scope = _clientDiagnostics.CreateScope("VpnLinkConnectionsOperations.ListByVpnConnection");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsRestOperations.cs
index 583cfefc5c5b2..4fb70711dc147 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnLinkConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnLinkConnectionsRestClient
+    internal partial class VpnLinkConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnLinkConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnLinkConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnLinkConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnLinkConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs
similarity index 89%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs
index ec2bcfde26e87..79ce5e345a08a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanOperations.cs
@@ -13,23 +13,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnServerConfigurationsAssociatedWithVirtualWan service client. </summary>
-    public partial class VpnServerConfigurationsAssociatedWithVirtualWanClient
+    public partial class VpnServerConfigurationsAssociatedWithVirtualWanOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnServerConfigurationsAssociatedWithVirtualWanRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanClient for mocking. </summary>
-        protected VpnServerConfigurationsAssociatedWithVirtualWanClient()
+        internal VpnServerConfigurationsAssociatedWithVirtualWanRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanOperations for mocking. </summary>
+        protected VpnServerConfigurationsAssociatedWithVirtualWanOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnServerConfigurationsAssociatedWithVirtualWanClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnServerConfigurationsAssociatedWithVirtualWanOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnServerConfigurationsAssociatedWithVirtualWanRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnServerConfigurationsAssociatedWithVirtualWanRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -49,7 +49,7 @@ public virtual async Task<VpnServerConfigurationsAssociatedWithVirtualWanListOpe
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanClient.StartList");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanOperations.StartList");
             scope.Start();
             try
             {
@@ -78,7 +78,7 @@ public virtual VpnServerConfigurationsAssociatedWithVirtualWanListOperation Star
                 throw new ArgumentNullException(nameof(virtualWANName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanClient.StartList");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsAssociatedWithVirtualWanOperations.StartList");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs
index 97dd2642b7130..8d77c08dbf6a1 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsAssociatedWithVirtualWanRestOperations.cs
@@ -14,20 +14,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnServerConfigurationsAssociatedWithVirtualWanRestClient
+    internal partial class VpnServerConfigurationsAssociatedWithVirtualWanRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsAssociatedWithVirtualWanRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnServerConfigurationsAssociatedWithVirtualWanRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnServerConfigurationsAssociatedWithVirtualWanRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsOperations.cs
index cbce1cbed1f5f..2e5d251a60184 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnServerConfigurations service client. </summary>
-    public partial class VpnServerConfigurationsClient
+    public partial class VpnServerConfigurationsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnServerConfigurationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsClient for mocking. </summary>
-        protected VpnServerConfigurationsClient()
+        internal VpnServerConfigurationsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnServerConfigurationsOperations for mocking. </summary>
+        protected VpnServerConfigurationsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnServerConfigurationsClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnServerConfigurationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnServerConfigurationsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnServerConfigurationsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnServerConfigurationsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VpnServerConfigurationsClient(ClientDiagnostics clientDiagnostics, Http
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnServerConfiguration>> GetAsync(string resourceGroupName, string vpnServerConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VpnServerConfiguration>> GetAsync(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnServerConfiguration> Get(string resourceGroupName, string vpnServerConfigurationName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VpnServerConfiguration> Get(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnServerConfiguration>> UpdateTagsAsync(string resourceGroupName, string vpnServerConfigurationName, TagsObject vpnServerConfigurationParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VpnServerConfiguration>> UpdateTagsAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnServerConfiguration> UpdateTags(string resourceGroupName, string vpnServerConfigurationName, TagsObject vpnServerConfigurationParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VpnServerConfiguration> ListByResourceGroupAsync(st
 
             async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnServerConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VpnServerConfiguration> ListByResourceGroup(string resou
 
             Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnServerConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VpnServerConfiguration> ListAsync(CancellationToken
         {
             async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VpnServerConfiguration>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnServerConfiguration>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VpnServerConfiguration> List(CancellationToken cancellat
         {
             Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VpnServerConfiguration> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnServerConfiguration> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VpnServerConfigurationsCreateOrUpdateOperation> StartC
                 throw new ArgumentNullException(nameof(vpnServerConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VpnServerConfigurationsCreateOrUpdateOperation StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(vpnServerConfigurationParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VpnServerConfigurationsDeleteOperation> StartDeleteAsy
                 throw new ArgumentNullException(nameof(vpnServerConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VpnServerConfigurationsDeleteOperation StartDelete(string resourc
                 throw new ArgumentNullException(nameof(vpnServerConfigurationName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnServerConfigurationsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsRestOperations.cs
index 47947058ff5e3..26032c0ae5a54 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnServerConfigurationsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnServerConfigurationsRestClient
+    internal partial class VpnServerConfigurationsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnServerConfigurationsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnServerConfigurationsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnServerConfigurationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnServerConfigurationsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsOperations.cs
similarity index 85%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsOperations.cs
index 4f70265ef4bda..0d2ae32b7dc25 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsOperations.cs
@@ -15,23 +15,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnSiteLinkConnections service client. </summary>
-    public partial class VpnSiteLinkConnectionsClient
+    public partial class VpnSiteLinkConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSiteLinkConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsClient for mocking. </summary>
-        protected VpnSiteLinkConnectionsClient()
+        internal VpnSiteLinkConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsOperations for mocking. </summary>
+        protected VpnSiteLinkConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSiteLinkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSiteLinkConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSiteLinkConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSiteLinkConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VpnSiteLinkConnectionsClient(ClientDiagnostics clientDiagnostics, HttpP
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSiteLinkConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<VpnSiteLinkConnection>> GetAsync(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSiteLinkConnection> Get(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinkConnectionsOperations.Get");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsRestOperations.cs
index 71701dd715ba8..d44dee3bd5f9c 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinkConnectionsRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnSiteLinkConnectionsRestClient
+    internal partial class VpnSiteLinkConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinkConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSiteLinkConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSiteLinkConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksOperations.cs
index 0a1742bae7ada..5f42671ea22b3 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnSiteLinks service client. </summary>
-    public partial class VpnSiteLinksClient
+    public partial class VpnSiteLinksOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSiteLinksRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSiteLinksClient for mocking. </summary>
-        protected VpnSiteLinksClient()
+        internal VpnSiteLinksRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSiteLinksOperations for mocking. </summary>
+        protected VpnSiteLinksOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSiteLinksClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinksOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSiteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSiteLinksOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSiteLinksRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSiteLinksRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal VpnSiteLinksClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSiteLink>> GetAsync(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -64,7 +64,7 @@ public virtual async Task<Response<VpnSiteLink>> GetAsync(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSiteLink> Get(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.Get");
             scope.Start();
             try
             {
@@ -94,7 +94,7 @@ public virtual AsyncPageable<VpnSiteLink> ListByVpnSiteAsync(string resourceGrou
 
             async Task<Page<VpnSiteLink>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
@@ -109,7 +109,7 @@ async Task<Page<VpnSiteLink>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSiteLink>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ public virtual Pageable<VpnSiteLink> ListByVpnSite(string resourceGroupName, str
 
             Page<VpnSiteLink> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
@@ -157,7 +157,7 @@ Page<VpnSiteLink> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSiteLink> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksClient.ListByVpnSite");
+                using var scope = _clientDiagnostics.CreateScope("VpnSiteLinksOperations.ListByVpnSite");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksRestOperations.cs
index 4ad9d67ec3c34..50015780de960 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSiteLinksRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnSiteLinksRestClient
+    internal partial class VpnSiteLinksRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSiteLinksRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSiteLinksRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSiteLinksRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSiteLinksRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationOperations.cs
similarity index 88%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationOperations.cs
index ee2b3a07ce17b..96061abddcc2a 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationOperations.cs
@@ -14,23 +14,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnSitesConfiguration service client. </summary>
-    public partial class VpnSitesConfigurationClient
+    public partial class VpnSitesConfigurationOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSitesConfigurationRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSitesConfigurationClient for mocking. </summary>
-        protected VpnSitesConfigurationClient()
+        internal VpnSitesConfigurationRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSitesConfigurationOperations for mocking. </summary>
+        protected VpnSitesConfigurationOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSitesConfigurationClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesConfigurationOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSitesConfigurationClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSitesConfigurationOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSitesConfigurationRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSitesConfigurationRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -55,7 +55,7 @@ public virtual async Task<VpnSitesConfigurationDownloadOperation> StartDownloadA
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationClient.StartDownload");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationOperations.StartDownload");
             scope.Start();
             try
             {
@@ -89,7 +89,7 @@ public virtual VpnSitesConfigurationDownloadOperation StartDownload(string resou
                 throw new ArgumentNullException(nameof(request));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationClient.StartDownload");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesConfigurationOperations.StartDownload");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationRestOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationRestOperations.cs
index aa2bd417f5cc9..9fc28ee83f838 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesConfigurationRestOperations.cs
@@ -15,20 +15,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnSitesConfigurationRestClient
+    internal partial class VpnSitesConfigurationRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSitesConfigurationRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesConfigurationRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSitesConfigurationRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSitesConfigurationRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesOperations.cs
index 89234983c4384..199ebf18d95b9 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The VpnSites service client. </summary>
-    public partial class VpnSitesClient
+    public partial class VpnSitesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal VpnSitesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of VpnSitesClient for mocking. </summary>
-        protected VpnSitesClient()
+        internal VpnSitesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of VpnSitesOperations for mocking. </summary>
+        protected VpnSitesOperations()
         {
         }
-        /// <summary> Initializes a new instance of VpnSitesClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal VpnSitesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal VpnSitesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new VpnSitesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new VpnSitesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal VpnSitesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeli
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSite>> GetAsync(string resourceGroupName, string vpnSiteName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<VpnSite>> GetAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSite> Get(string resourceGroupName, string vpnSiteName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<VpnSite> Get(string resourceGroupName, string vpnSiteNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<VpnSite>> UpdateTagsAsync(string resourceGroupName, string vpnSiteName, TagsObject vpnSiteParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<VpnSite>> UpdateTagsAsync(string resourceGrou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<VpnSite> UpdateTags(string resourceGroupName, string vpnSiteName, TagsObject vpnSiteParameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.UpdateTags");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.UpdateTags");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<VpnSite> ListByResourceGroupAsync(string resourceGr
 
             async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSite>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<VpnSite> ListByResourceGroup(string resourceGroupName, C
 
             Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSite> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<VpnSite> ListAsync(CancellationToken cancellationTo
         {
             async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<VpnSite>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<VpnSite>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<VpnSite> List(CancellationToken cancellationToken = defa
         {
             Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<VpnSite> FirstPageFunc(int? pageSizeHint)
             }
             Page<VpnSite> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.List");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ public virtual async Task<VpnSitesCreateOrUpdateOperation> StartCreateOrUpdateAs
                 throw new ArgumentNullException(nameof(vpnSiteParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -329,7 +329,7 @@ public virtual VpnSitesCreateOrUpdateOperation StartCreateOrUpdate(string resour
                 throw new ArgumentNullException(nameof(vpnSiteParameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -358,7 +358,7 @@ public virtual async Task<VpnSitesDeleteOperation> StartDeleteAsync(string resou
                 throw new ArgumentNullException(nameof(vpnSiteName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -387,7 +387,7 @@ public virtual VpnSitesDeleteOperation StartDelete(string resourceGroupName, str
                 throw new ArgumentNullException(nameof(vpnSiteName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("VpnSitesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("VpnSitesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesRestOperations.cs
index 6dfc3eb3948a9..665b1072f3a2b 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/VpnSitesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class VpnSitesRestClient
+    internal partial class VpnSitesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of VpnSitesRestClient. </summary>
+        /// <summary> Initializes a new instance of VpnSitesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public VpnSitesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public VpnSitesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesOperations.cs
index 933552298f6d4..6eca1962143da 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesOperations.cs
@@ -16,23 +16,23 @@
 namespace Azure.Management.Network
 {
     /// <summary> The WebApplicationFirewallPolicies service client. </summary>
-    public partial class WebApplicationFirewallPoliciesClient
+    public partial class WebApplicationFirewallPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal WebApplicationFirewallPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesClient for mocking. </summary>
-        protected WebApplicationFirewallPoliciesClient()
+        internal WebApplicationFirewallPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesOperations for mocking. </summary>
+        protected WebApplicationFirewallPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
-        internal WebApplicationFirewallPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        internal WebApplicationFirewallPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
-            RestClient = new WebApplicationFirewallPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint);
+            RestClient = new WebApplicationFirewallPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal WebApplicationFirewallPoliciesClient(ClientDiagnostics clientDiagnostic
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<WebApplicationFirewallPolicy>> GetAsync(string resourceGroupName, string policyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<WebApplicationFirewallPolicy>> GetAsync(strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<WebApplicationFirewallPolicy> Get(string resourceGroupName, string policyName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<WebApplicationFirewallPolicy> Get(string resourceGroupNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<WebApplicationFirewallPolicy>> CreateOrUpdateAsync(string resourceGroupName, string policyName, WebApplicationFirewallPolicy parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<WebApplicationFirewallPolicy>> CreateOrUpdate
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<WebApplicationFirewallPolicy> CreateOrUpdate(string resourceGroupName, string policyName, WebApplicationFirewallPolicy parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual AsyncPageable<WebApplicationFirewallPolicy> ListAsync(string reso
 
             async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -142,7 +142,7 @@ async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<WebApplicationFirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -170,7 +170,7 @@ public virtual Pageable<WebApplicationFirewallPolicy> List(string resourceGroupN
 
             Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -185,7 +185,7 @@ Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<WebApplicationFirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ public virtual AsyncPageable<WebApplicationFirewallPolicy> ListAllAsync(Cancella
         {
             async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -222,7 +222,7 @@ async Task<Page<WebApplicationFirewallPolicy>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<WebApplicationFirewallPolicy>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ public virtual Pageable<WebApplicationFirewallPolicy> ListAll(CancellationToken
         {
             Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ Page<WebApplicationFirewallPolicy> FirstPageFunc(int? pageSizeHint)
             }
             Page<WebApplicationFirewallPolicy> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.ListAll");
+                using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.ListAll");
                 scope.Start();
                 try
                 {
@@ -290,7 +290,7 @@ public virtual async Task<WebApplicationFirewallPoliciesDeleteOperation> StartDe
                 throw new ArgumentNullException(nameof(policyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -319,7 +319,7 @@ public virtual WebApplicationFirewallPoliciesDeleteOperation StartDelete(string
                 throw new ArgumentNullException(nameof(policyName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("WebApplicationFirewallPoliciesOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesRestClient.cs b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesRestClient.cs
rename to sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesRestOperations.cs
index d94f40b26bdd9..fef705945b0bd 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/src/Generated/WebApplicationFirewallPoliciesRestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Network
 {
-    internal partial class WebApplicationFirewallPoliciesRestClient
+    internal partial class WebApplicationFirewallPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of WebApplicationFirewallPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The subscription credentials which uniquely identify the Microsoft Azure subscription. The subscription ID forms part of the URI for every service call. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public WebApplicationFirewallPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
+        public WebApplicationFirewallPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null)
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentOperations.cs
similarity index 90%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentOperations.cs
index 8175d75ab10e1..678996d008089 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Resources
 {
     /// <summary> The Deployment service client. </summary>
-    public partial class DeploymentClient
+    public partial class DeploymentOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DeploymentRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DeploymentClient for mocking. </summary>
-        protected DeploymentClient()
+        internal DeploymentRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DeploymentOperations for mocking. </summary>
+        protected DeploymentOperations()
         {
         }
-        /// <summary> Initializes a new instance of DeploymentClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal DeploymentClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        internal DeploymentOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
-            RestClient = new DeploymentRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new DeploymentRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal DeploymentClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentOperation>> GetAsync(string resourceGroupName, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<DeploymentOperation>> GetAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentOperation> Get(string resourceGroupName, string deploymentName, string operationId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentOperations.Get");
             scope.Start();
             try
             {
@@ -96,7 +96,7 @@ public virtual AsyncPageable<DeploymentOperation> ListAsync(string resourceGroup
 
             async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope.Start();
                 try
                 {
@@ -111,7 +111,7 @@ async Task<Page<DeploymentOperation>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentOperation>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope.Start();
                 try
                 {
@@ -145,7 +145,7 @@ public virtual Pageable<DeploymentOperation> List(string resourceGroupName, stri
 
             Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope.Start();
                 try
                 {
@@ -160,7 +160,7 @@ Page<DeploymentOperation> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentOperation> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentClient.List");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentRestClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentRestClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentRestOperations.cs
index 0501869a70ed5..4024807a5ad7f 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Resources
 {
-    internal partial class DeploymentRestClient
+    internal partial class DeploymentRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class DeploymentRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DeploymentRestClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DeploymentRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        public DeploymentRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsOperations.cs
index cdd4cc85389e2..0f3ffc926ff66 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Resources
 {
     /// <summary> The Deployments service client. </summary>
-    public partial class DeploymentsClient
+    public partial class DeploymentsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal DeploymentsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of DeploymentsClient for mocking. </summary>
-        protected DeploymentsClient()
+        internal DeploymentsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of DeploymentsOperations for mocking. </summary>
+        protected DeploymentsOperations()
         {
         }
-        /// <summary> Initializes a new instance of DeploymentsClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal DeploymentsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        internal DeploymentsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
-            RestClient = new DeploymentsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new DeploymentsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal DeploymentsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistence(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response CheckExistence(string resourceGroupName, string deployme
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExtended>> GetAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.Get");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<DeploymentExtended>> GetAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExtended> Get(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.Get");
             scope.Start();
             try
             {
@@ -120,7 +120,7 @@ public virtual Response<DeploymentExtended> Get(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CancelAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.Cancel");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.Cancel");
             scope.Start();
             try
             {
@@ -139,7 +139,7 @@ public virtual async Task<Response> CancelAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Cancel(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.Cancel");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.Cancel");
             scope.Start();
             try
             {
@@ -159,7 +159,7 @@ public virtual Response Cancel(string resourceGroupName, string deploymentName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentValidateResult>> ValidateAsync(string resourceGroupName, string deploymentName, Deployment parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.Validate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.Validate");
             scope.Start();
             try
             {
@@ -179,7 +179,7 @@ public virtual async Task<Response<DeploymentValidateResult>> ValidateAsync(stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentValidateResult> Validate(string resourceGroupName, string deploymentName, Deployment parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.Validate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.Validate");
             scope.Start();
             try
             {
@@ -198,7 +198,7 @@ public virtual Response<DeploymentValidateResult> Validate(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAsync(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplate");
             scope.Start();
             try
             {
@@ -217,7 +217,7 @@ public virtual async Task<Response<DeploymentExportResult>> ExportTemplateAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<DeploymentExportResult> ExportTemplate(string resourceGroupName, string deploymentName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.ExportTemplate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.ExportTemplate");
             scope.Start();
             try
             {
@@ -235,7 +235,7 @@ public virtual Response<DeploymentExportResult> ExportTemplate(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TemplateHashResult>> CalculateTemplateHashAsync(object template, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.CalculateTemplateHash");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.CalculateTemplateHash");
             scope.Start();
             try
             {
@@ -253,7 +253,7 @@ public virtual async Task<Response<TemplateHashResult>> CalculateTemplateHashAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TemplateHashResult> CalculateTemplateHash(object template, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.CalculateTemplateHash");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.CalculateTemplateHash");
             scope.Start();
             try
             {
@@ -280,7 +280,7 @@ public virtual AsyncPageable<DeploymentExtended> ListByResourceGroupAsync(string
 
             async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -295,7 +295,7 @@ async Task<Page<DeploymentExtended>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<DeploymentExtended>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -325,7 +325,7 @@ public virtual Pageable<DeploymentExtended> ListByResourceGroup(string resourceG
 
             Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -340,7 +340,7 @@ Page<DeploymentExtended> FirstPageFunc(int? pageSizeHint)
             }
             Page<DeploymentExtended> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -371,7 +371,7 @@ public virtual async Task<DeploymentsDeleteOperation> StartDeleteAsync(string re
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -400,7 +400,7 @@ public virtual DeploymentsDeleteOperation StartDelete(string resourceGroupName,
                 throw new ArgumentNullException(nameof(deploymentName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -434,7 +434,7 @@ public virtual async Task<DeploymentsCreateOrUpdateOperation> StartCreateOrUpdat
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -468,7 +468,7 @@ public virtual DeploymentsCreateOrUpdateOperation StartCreateOrUpdate(string res
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("DeploymentsClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("DeploymentsOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsRestClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsRestClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsRestOperations.cs
index 54c8958c7325d..5bee1fad8719b 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/DeploymentsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Resources
 {
-    internal partial class DeploymentsRestClient
+    internal partial class DeploymentsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class DeploymentsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of DeploymentsRestClient. </summary>
+        /// <summary> Initializes a new instance of DeploymentsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public DeploymentsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        public DeploymentsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersOperations.cs
index 2ac4ccd2b549e..e629d26e9087c 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Resources
 {
     /// <summary> The Providers service client. </summary>
-    public partial class ProvidersClient
+    public partial class ProvidersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ProvidersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ProvidersClient for mocking. </summary>
-        protected ProvidersClient()
+        internal ProvidersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ProvidersOperations for mocking. </summary>
+        protected ProvidersOperations()
         {
         }
-        /// <summary> Initializes a new instance of ProvidersClient. </summary>
+        /// <summary> Initializes a new instance of ProvidersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        internal ProvidersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
-            RestClient = new ProvidersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ProvidersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ProvidersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> UnregisterAsync(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Unregister");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Unregister");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<Provider>> UnregisterAsync(string resourcePro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> Unregister(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Unregister");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Unregister");
             scope.Start();
             try
             {
@@ -79,7 +79,7 @@ public virtual Response<Provider> Unregister(string resourceProviderNamespace, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> RegisterAsync(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Register");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Register");
             scope.Start();
             try
             {
@@ -97,7 +97,7 @@ public virtual async Task<Response<Provider>> RegisterAsync(string resourceProvi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> Register(string resourceProviderNamespace, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Register");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Register");
             scope.Start();
             try
             {
@@ -116,7 +116,7 @@ public virtual Response<Provider> Register(string resourceProviderNamespace, Can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Provider>> GetAsync(string resourceProviderNamespace, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual async Task<Response<Provider>> GetAsync(string resourceProviderNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Provider> Get(string resourceProviderNamespace, string expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ProvidersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.Get");
             scope.Start();
             try
             {
@@ -156,7 +156,7 @@ public virtual AsyncPageable<Provider> ListAsync(int? top = null, string expand
         {
             async Task<Page<Provider>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -171,7 +171,7 @@ async Task<Page<Provider>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Provider>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -195,7 +195,7 @@ public virtual Pageable<Provider> List(int? top = null, string expand = null, Ca
         {
             Page<Provider> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ Page<Provider> FirstPageFunc(int? pageSizeHint)
             }
             Page<Provider> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ProvidersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ProvidersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersRestClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersRestClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersRestOperations.cs
index d22af78fa6cff..a71970c906f9e 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ProvidersRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Resources
 {
-    internal partial class ProvidersRestClient
+    internal partial class ProvidersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ProvidersRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ProvidersRestClient. </summary>
+        /// <summary> Initializes a new instance of ProvidersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ProvidersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        public ProvidersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsOperations.cs
index e1ffa9397b7b9..dce8c8ee4b08b 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Resources
 {
     /// <summary> The ResourceGroups service client. </summary>
-    public partial class ResourceGroupsClient
+    public partial class ResourceGroupsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourceGroupsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourceGroupsClient for mocking. </summary>
-        protected ResourceGroupsClient()
+        internal ResourceGroupsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourceGroupsOperations for mocking. </summary>
+        protected ResourceGroupsOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourceGroupsClient. </summary>
+        /// <summary> Initializes a new instance of ResourceGroupsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ResourceGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        internal ResourceGroupsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
-            RestClient = new ResourceGroupsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ResourceGroupsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ResourceGroupsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistence(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response CheckExistence(string resourceGroupName, CancellationTok
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroup>> CreateOrUpdateAsync(string resourceGroupName, ResourceGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -99,7 +99,7 @@ public virtual async Task<Response<ResourceGroup>> CreateOrUpdateAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroup> CreateOrUpdate(string resourceGroupName, ResourceGroup parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -117,7 +117,7 @@ public virtual Response<ResourceGroup> CreateOrUpdate(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroup>> GetAsync(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -135,7 +135,7 @@ public virtual async Task<Response<ResourceGroup>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroup> Get(string resourceGroupName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Get");
             scope.Start();
             try
             {
@@ -154,7 +154,7 @@ public virtual Response<ResourceGroup> Get(string resourceGroupName, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroup>> UpdateAsync(string resourceGroupName, ResourceGroupPatchable parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -173,7 +173,7 @@ public virtual async Task<Response<ResourceGroup>> UpdateAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroup> Update(string resourceGroupName, ResourceGroupPatchable parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.Update");
             scope.Start();
             try
             {
@@ -192,7 +192,7 @@ public virtual Response<ResourceGroup> Update(string resourceGroupName, Resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ResourceGroupExportResult>> ExportTemplateAsync(string resourceGroupName, ExportTemplateRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.ExportTemplate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.ExportTemplate");
             scope.Start();
             try
             {
@@ -211,7 +211,7 @@ public virtual async Task<Response<ResourceGroupExportResult>> ExportTemplateAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ResourceGroupExportResult> ExportTemplate(string resourceGroupName, ExportTemplateRequest parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.ExportTemplate");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.ExportTemplate");
             scope.Start();
             try
             {
@@ -232,7 +232,7 @@ public virtual AsyncPageable<ResourceGroup> ListAsync(string filter = null, int?
         {
             async Task<Page<ResourceGroup>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -247,7 +247,7 @@ async Task<Page<ResourceGroup>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ResourceGroup>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -271,7 +271,7 @@ public virtual Pageable<ResourceGroup> List(string filter = null, int? top = nul
         {
             Page<ResourceGroup> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ Page<ResourceGroup> FirstPageFunc(int? pageSizeHint)
             }
             Page<ResourceGroup> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.List");
                 scope.Start();
                 try
                 {
@@ -312,7 +312,7 @@ public virtual async Task<ResourceGroupsDeleteOperation> StartDeleteAsync(string
                 throw new ArgumentNullException(nameof(resourceGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.StartDelete");
             scope.Start();
             try
             {
@@ -336,7 +336,7 @@ public virtual ResourceGroupsDeleteOperation StartDelete(string resourceGroupNam
                 throw new ArgumentNullException(nameof(resourceGroupName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourceGroupsOperations.StartDelete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsRestClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsRestClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsRestOperations.cs
index 7cc73a6faf151..5666024defe5b 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourceGroupsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Resources
 {
-    internal partial class ResourceGroupsRestClient
+    internal partial class ResourceGroupsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ResourceGroupsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourceGroupsRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourceGroupsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourceGroupsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        public ResourceGroupsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesManagementClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesManagementClient.cs
index 71996d9a6bdef..d63e2f9c71e8e 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesManagementClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesManagementClient.cs
@@ -53,40 +53,22 @@ public ResourcesManagementClient(string subscriptionId, Uri endpoint, TokenCrede
             _endpoint = endpoint;
         }
 
-        /// <summary> Creates a new instance of DeploymentsClient. </summary>
-        public virtual DeploymentsClient GetDeploymentsClient()
-        {
-            return new DeploymentsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DeploymentsOperations. </summary>
+        public virtual DeploymentsOperations Deployments => new DeploymentsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ProvidersClient. </summary>
-        public virtual ProvidersClient GetProvidersClient()
-        {
-            return new ProvidersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ProvidersOperations. </summary>
+        public virtual ProvidersOperations Providers => new ProvidersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourcesClient. </summary>
-        public virtual ResourcesClient GetResourcesClient()
-        {
-            return new ResourcesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourcesOperations. </summary>
+        public virtual ResourcesOperations Resources => new ResourcesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ResourceGroupsClient. </summary>
-        public virtual ResourceGroupsClient GetResourceGroupsClient()
-        {
-            return new ResourceGroupsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ResourceGroupsOperations. </summary>
+        public virtual ResourceGroupsOperations ResourceGroups => new ResourceGroupsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of TagsClient. </summary>
-        public virtual TagsClient GetTagsClient()
-        {
-            return new TagsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of TagsOperations. </summary>
+        public virtual TagsOperations Tags => new TagsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of DeploymentClient. </summary>
-        public virtual DeploymentClient GetDeploymentClient()
-        {
-            return new DeploymentClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of DeploymentOperations. </summary>
+        public virtual DeploymentOperations Deployment => new DeploymentOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesOperations.cs
index db5b34e59155f..2b796cf88bb8e 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Resources
 {
     /// <summary> The Resources service client. </summary>
-    public partial class ResourcesClient
+    public partial class ResourcesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ResourcesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ResourcesClient for mocking. </summary>
-        protected ResourcesClient()
+        internal ResourcesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ResourcesOperations for mocking. </summary>
+        protected ResourcesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ResourcesClient. </summary>
+        /// <summary> Initializes a new instance of ResourcesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        internal ResourcesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
-            RestClient = new ResourcesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ResourcesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -47,7 +47,7 @@ internal ResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -69,7 +69,7 @@ public virtual async Task<Response> CheckExistenceAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistence(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistence");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistence");
             scope.Start();
             try
             {
@@ -91,7 +91,7 @@ public virtual Response CheckExistence(string resourceGroupName, string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GenericResource>> GetAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.Get");
             scope.Start();
             try
             {
@@ -113,7 +113,7 @@ public virtual async Task<Response<GenericResource>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GenericResource> Get(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.Get");
             scope.Start();
             try
             {
@@ -131,7 +131,7 @@ public virtual Response<GenericResource> Get(string resourceGroupName, string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> CheckExistenceByIdAsync(string resourceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistenceById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistenceById");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response> CheckExistenceByIdAsync(string resourceId, C
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response CheckExistenceById(string resourceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.CheckExistenceById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.CheckExistenceById");
             scope.Start();
             try
             {
@@ -167,7 +167,7 @@ public virtual Response CheckExistenceById(string resourceId, CancellationToken
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<GenericResource>> GetByIdAsync(string resourceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.GetById");
             scope.Start();
             try
             {
@@ -185,7 +185,7 @@ public virtual async Task<Response<GenericResource>> GetByIdAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<GenericResource> GetById(string resourceId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.GetById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.GetById");
             scope.Start();
             try
             {
@@ -213,7 +213,7 @@ public virtual AsyncPageable<GenericResourceExpanded> ListByResourceGroupAsync(s
 
             async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -228,7 +228,7 @@ async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GenericResourceExpanded>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -259,7 +259,7 @@ public virtual Pageable<GenericResourceExpanded> ListByResourceGroup(string reso
 
             Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -274,7 +274,7 @@ Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             }
             Page<GenericResourceExpanded> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -299,7 +299,7 @@ public virtual AsyncPageable<GenericResourceExpanded> ListAsync(string filter =
         {
             async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -314,7 +314,7 @@ async Task<Page<GenericResourceExpanded>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<GenericResourceExpanded>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -339,7 +339,7 @@ public virtual Pageable<GenericResourceExpanded> List(string filter = null, stri
         {
             Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -354,7 +354,7 @@ Page<GenericResourceExpanded> FirstPageFunc(int? pageSizeHint)
             }
             Page<GenericResourceExpanded> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ResourcesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.List");
                 scope.Start();
                 try
                 {
@@ -385,7 +385,7 @@ public virtual async Task<ResourcesMoveResourcesOperation> StartMoveResourcesAsy
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartMoveResources");
             scope.Start();
             try
             {
@@ -414,7 +414,7 @@ public virtual ResourcesMoveResourcesOperation StartMoveResources(string sourceR
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartMoveResources");
             scope.Start();
             try
             {
@@ -443,7 +443,7 @@ public virtual async Task<ResourcesValidateMoveResourcesOperation> StartValidate
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartValidateMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartValidateMoveResources");
             scope.Start();
             try
             {
@@ -472,7 +472,7 @@ public virtual ResourcesValidateMoveResourcesOperation StartValidateMoveResource
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartValidateMoveResources");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartValidateMoveResources");
             scope.Start();
             try
             {
@@ -516,7 +516,7 @@ public virtual async Task<ResourcesDeleteOperation> StartDeleteAsync(string reso
                 throw new ArgumentNullException(nameof(resourceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -560,7 +560,7 @@ public virtual ResourcesDeleteOperation StartDelete(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(resourceName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDelete");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDelete");
             scope.Start();
             try
             {
@@ -609,7 +609,7 @@ public virtual async Task<ResourcesCreateOrUpdateOperation> StartCreateOrUpdateA
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -658,7 +658,7 @@ public virtual ResourcesCreateOrUpdateOperation StartCreateOrUpdate(string resou
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdate");
             scope.Start();
             try
             {
@@ -707,7 +707,7 @@ public virtual async Task<ResourcesUpdateOperation> StartUpdateAsync(string reso
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -756,7 +756,7 @@ public virtual ResourcesUpdateOperation StartUpdate(string resourceGroupName, st
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdate");
             scope.Start();
             try
             {
@@ -780,7 +780,7 @@ public virtual async Task<ResourcesDeleteByIdOperation> StartDeleteByIdAsync(str
                 throw new ArgumentNullException(nameof(resourceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -804,7 +804,7 @@ public virtual ResourcesDeleteByIdOperation StartDeleteById(string resourceId, C
                 throw new ArgumentNullException(nameof(resourceId));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartDeleteById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartDeleteById");
             scope.Start();
             try
             {
@@ -833,7 +833,7 @@ public virtual async Task<ResourcesCreateOrUpdateByIdOperation> StartCreateOrUpd
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
@@ -862,7 +862,7 @@ public virtual ResourcesCreateOrUpdateByIdOperation StartCreateOrUpdateById(stri
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartCreateOrUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartCreateOrUpdateById");
             scope.Start();
             try
             {
@@ -891,7 +891,7 @@ public virtual async Task<ResourcesUpdateByIdOperation> StartUpdateByIdAsync(str
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdateById");
             scope.Start();
             try
             {
@@ -920,7 +920,7 @@ public virtual ResourcesUpdateByIdOperation StartUpdateById(string resourceId, G
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("ResourcesClient.StartUpdateById");
+            using var scope = _clientDiagnostics.CreateScope("ResourcesOperations.StartUpdateById");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesRestClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesRestClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesRestOperations.cs
index 0db8ab12180a1..025528fb5fb71 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/ResourcesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Resources
 {
-    internal partial class ResourcesRestClient
+    internal partial class ResourcesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ResourcesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ResourcesRestClient. </summary>
+        /// <summary> Initializes a new instance of ResourcesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ResourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        public ResourcesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsOperations.cs
similarity index 92%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsOperations.cs
index b4b83cc9073ec..acabd2aafcddc 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Resources
 {
     /// <summary> The Tags service client. </summary>
-    public partial class TagsClient
+    public partial class TagsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TagsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TagsClient for mocking. </summary>
-        protected TagsClient()
+        internal TagsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TagsOperations for mocking. </summary>
+        protected TagsOperations()
         {
         }
-        /// <summary> Initializes a new instance of TagsClient. </summary>
+        /// <summary> Initializes a new instance of TagsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal TagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        internal TagsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
-            RestClient = new TagsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new TagsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ internal TagsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteValueAsync(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.DeleteValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.DeleteValue");
             scope.Start();
             try
             {
@@ -63,7 +63,7 @@ public virtual async Task<Response> DeleteValueAsync(string tagName, string tagV
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response DeleteValue(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.DeleteValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.DeleteValue");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response DeleteValue(string tagName, string tagValue, Cancellatio
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagValue>> CreateOrUpdateValueAsync(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdateValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdateValue");
             scope.Start();
             try
             {
@@ -101,7 +101,7 @@ public virtual async Task<Response<TagValue>> CreateOrUpdateValueAsync(string ta
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagValue> CreateOrUpdateValue(string tagName, string tagValue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdateValue");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdateValue");
             scope.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response<TagValue> CreateOrUpdateValue(string tagName, string tag
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TagDetails>> CreateOrUpdateAsync(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -137,7 +137,7 @@ public virtual async Task<Response<TagDetails>> CreateOrUpdateAsync(string tagNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TagDetails> CreateOrUpdate(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -155,7 +155,7 @@ public virtual Response<TagDetails> CreateOrUpdate(string tagName, CancellationT
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.Delete");
             scope.Start();
             try
             {
@@ -173,7 +173,7 @@ public virtual async Task<Response> DeleteAsync(string tagName, CancellationToke
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string tagName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TagsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TagsOperations.Delete");
             scope.Start();
             try
             {
@@ -192,7 +192,7 @@ public virtual AsyncPageable<TagDetails> ListAsync(CancellationToken cancellatio
         {
             async Task<Page<TagDetails>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope.Start();
                 try
                 {
@@ -207,7 +207,7 @@ async Task<Page<TagDetails>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<TagDetails>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope.Start();
                 try
                 {
@@ -229,7 +229,7 @@ public virtual Pageable<TagDetails> List(CancellationToken cancellationToken = d
         {
             Page<TagDetails> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope.Start();
                 try
                 {
@@ -244,7 +244,7 @@ Page<TagDetails> FirstPageFunc(int? pageSizeHint)
             }
             Page<TagDetails> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TagsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TagsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsRestClient.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsRestClient.cs
rename to sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsRestOperations.cs
index 6cbf81851a37c..942970eddf7c1 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/src/Generated/TagsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Resources
 {
-    internal partial class TagsRestClient
+    internal partial class TagsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class TagsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TagsRestClient. </summary>
+        /// <summary> Initializes a new instance of TagsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public TagsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
+        public TagsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2017-05-10")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersOperations.cs
index be09e1d976147..8e16f92ee63fa 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The BlobContainers service client. </summary>
-    public partial class BlobContainersClient
+    public partial class BlobContainersOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BlobContainersRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BlobContainersClient for mocking. </summary>
-        protected BlobContainersClient()
+        internal BlobContainersRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BlobContainersOperations for mocking. </summary>
+        protected BlobContainersOperations()
         {
         }
-        /// <summary> Initializes a new instance of BlobContainersClient. </summary>
+        /// <summary> Initializes a new instance of BlobContainersOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal BlobContainersClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal BlobContainersOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new BlobContainersRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new BlobContainersRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal BlobContainersClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobContainer>> CreateAsync(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Create");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<BlobContainer>> CreateAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobContainer> Create(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Create");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<BlobContainer> Create(string resourceGroupName, string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobContainer>> UpdateAsync(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Update");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<BlobContainer>> UpdateAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobContainer> Update(string resourceGroupName, string accountName, string containerName, BlobContainer blobContainer, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Update");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<BlobContainer> Update(string resourceGroupName, string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobContainer>> GetAsync(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<BlobContainer>> GetAsync(string resourceGroup
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobContainer> Get(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Get");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<BlobContainer> Get(string resourceGroupName, string acco
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Delete");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string containerName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Delete");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response Delete(string resourceGroupName, string accountName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LegalHold>> SetLegalHoldAsync(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.SetLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.SetLegalHold");
             scope.Start();
             try
             {
@@ -231,7 +231,7 @@ public virtual async Task<Response<LegalHold>> SetLegalHoldAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LegalHold> SetLegalHold(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.SetLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.SetLegalHold");
             scope.Start();
             try
             {
@@ -252,7 +252,7 @@ public virtual Response<LegalHold> SetLegalHold(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LegalHold>> ClearLegalHoldAsync(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ClearLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ClearLegalHold");
             scope.Start();
             try
             {
@@ -273,7 +273,7 @@ public virtual async Task<Response<LegalHold>> ClearLegalHoldAsync(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LegalHold> ClearLegalHold(string resourceGroupName, string accountName, string containerName, LegalHold legalHold, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ClearLegalHold");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ClearLegalHold");
             scope.Start();
             try
             {
@@ -295,7 +295,7 @@ public virtual Response<LegalHold> ClearLegalHold(string resourceGroupName, stri
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> CreateOrUpdateImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch = null, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.CreateOrUpdateImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.CreateOrUpdateImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> CreateOrUpdateImmutabili
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> CreateOrUpdateImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch = null, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.CreateOrUpdateImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.CreateOrUpdateImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -338,7 +338,7 @@ public virtual Response<ImmutabilityPolicy> CreateOrUpdateImmutabilityPolicy(str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> GetImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.GetImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.GetImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -359,7 +359,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> GetImmutabilityPolicyAsy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> GetImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.GetImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.GetImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -380,7 +380,7 @@ public virtual Response<ImmutabilityPolicy> GetImmutabilityPolicy(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> DeleteImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.DeleteImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.DeleteImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -401,7 +401,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> DeleteImmutabilityPolicy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> DeleteImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.DeleteImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.DeleteImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -422,7 +422,7 @@ public virtual Response<ImmutabilityPolicy> DeleteImmutabilityPolicy(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> LockImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.LockImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.LockImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -443,7 +443,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> LockImmutabilityPolicyAs
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> LockImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.LockImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.LockImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -465,7 +465,7 @@ public virtual Response<ImmutabilityPolicy> LockImmutabilityPolicy(string resour
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ImmutabilityPolicy>> ExtendImmutabilityPolicyAsync(string resourceGroupName, string accountName, string containerName, string ifMatch, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ExtendImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ExtendImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -487,7 +487,7 @@ public virtual async Task<Response<ImmutabilityPolicy>> ExtendImmutabilityPolicy
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ImmutabilityPolicy> ExtendImmutabilityPolicy(string resourceGroupName, string accountName, string containerName, string ifMatch, ImmutabilityPolicy parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.ExtendImmutabilityPolicy");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.ExtendImmutabilityPolicy");
             scope.Start();
             try
             {
@@ -508,7 +508,7 @@ public virtual Response<ImmutabilityPolicy> ExtendImmutabilityPolicy(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<LeaseContainerResponse>> LeaseAsync(string resourceGroupName, string accountName, string containerName, LeaseContainerRequest parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Lease");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Lease");
             scope.Start();
             try
             {
@@ -529,7 +529,7 @@ public virtual async Task<Response<LeaseContainerResponse>> LeaseAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<LeaseContainerResponse> Lease(string resourceGroupName, string accountName, string containerName, LeaseContainerRequest parameters = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.Lease");
+            using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.Lease");
             scope.Start();
             try
             {
@@ -561,7 +561,7 @@ public virtual AsyncPageable<ListContainerItem> ListAsync(string resourceGroupNa
 
             async Task<Page<ListContainerItem>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
@@ -576,7 +576,7 @@ async Task<Page<ListContainerItem>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ListContainerItem>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
@@ -611,7 +611,7 @@ public virtual Pageable<ListContainerItem> List(string resourceGroupName, string
 
             Page<ListContainerItem> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
@@ -626,7 +626,7 @@ Page<ListContainerItem> FirstPageFunc(int? pageSizeHint)
             }
             Page<ListContainerItem> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobContainersClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobContainersOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersRestOperations.cs
index 9c58af1463010..4ce9a38ab4146 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobContainersRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class BlobContainersRestClient
+    internal partial class BlobContainersRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class BlobContainersRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BlobContainersRestClient. </summary>
+        /// <summary> Initializes a new instance of BlobContainersRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BlobContainersRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public BlobContainersRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesOperations.cs
similarity index 92%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesOperations.cs
index a87ff713510b3..dfe2d722ae907 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The BlobServices service client. </summary>
-    public partial class BlobServicesClient
+    public partial class BlobServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal BlobServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of BlobServicesClient for mocking. </summary>
-        protected BlobServicesClient()
+        internal BlobServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of BlobServicesOperations for mocking. </summary>
+        protected BlobServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of BlobServicesClient. </summary>
+        /// <summary> Initializes a new instance of BlobServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal BlobServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal BlobServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new BlobServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new BlobServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal BlobServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, BlobServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<BlobServiceProperties>> SetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, BlobServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -84,7 +84,7 @@ public virtual Response<BlobServiceProperties> SetServiceProperties(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<BlobServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -103,7 +103,7 @@ public virtual async Task<Response<BlobServiceProperties>> GetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<BlobServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -133,7 +133,7 @@ public virtual AsyncPageable<BlobServiceProperties> ListAsync(string resourceGro
 
             async Task<Page<BlobServiceProperties>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.List");
                 scope.Start();
                 try
                 {
@@ -166,7 +166,7 @@ public virtual Pageable<BlobServiceProperties> List(string resourceGroupName, st
 
             Page<BlobServiceProperties> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("BlobServicesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("BlobServicesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesRestOperations.cs
index ec9a1aa9058e9..e6d74fdd9707a 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/BlobServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class BlobServicesRestClient
+    internal partial class BlobServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class BlobServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of BlobServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of BlobServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public BlobServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public BlobServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesOperations.cs
index a2d6cdcdd5e2a..ec149984bde3b 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The EncryptionScopes service client. </summary>
-    public partial class EncryptionScopesClient
+    public partial class EncryptionScopesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal EncryptionScopesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of EncryptionScopesClient for mocking. </summary>
-        protected EncryptionScopesClient()
+        internal EncryptionScopesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of EncryptionScopesOperations for mocking. </summary>
+        protected EncryptionScopesOperations()
         {
         }
-        /// <summary> Initializes a new instance of EncryptionScopesClient. </summary>
+        /// <summary> Initializes a new instance of EncryptionScopesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal EncryptionScopesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal EncryptionScopesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new EncryptionScopesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new EncryptionScopesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal EncryptionScopesClient(ClientDiagnostics clientDiagnostics, HttpPipelin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EncryptionScope>> PutAsync(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Put");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<EncryptionScope>> PutAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EncryptionScope> Put(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Put");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<EncryptionScope> Put(string resourceGroupName, string ac
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EncryptionScope>> PatchAsync(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Patch");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<EncryptionScope>> PatchAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EncryptionScope> Patch(string resourceGroupName, string accountName, string encryptionScopeName, EncryptionScope encryptionScope, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Patch");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Patch");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<EncryptionScope> Patch(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<EncryptionScope>> GetAsync(string resourceGroupName, string accountName, string encryptionScopeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<EncryptionScope>> GetAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<EncryptionScope> Get(string resourceGroupName, string accountName, string encryptionScopeName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.Get");
             scope.Start();
             try
             {
@@ -179,7 +179,7 @@ public virtual AsyncPageable<EncryptionScope> ListAsync(string resourceGroupName
 
             async Task<Page<EncryptionScope>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
@@ -194,7 +194,7 @@ async Task<Page<EncryptionScope>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<EncryptionScope>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
@@ -227,7 +227,7 @@ public virtual Pageable<EncryptionScope> List(string resourceGroupName, string a
 
             Page<EncryptionScope> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
@@ -242,7 +242,7 @@ Page<EncryptionScope> FirstPageFunc(int? pageSizeHint)
             }
             Page<EncryptionScope> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("EncryptionScopesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesRestOperations.cs
index 9b18127949973..f26ee364b7b39 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/EncryptionScopesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class EncryptionScopesRestClient
+    internal partial class EncryptionScopesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class EncryptionScopesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of EncryptionScopesRestClient. </summary>
+        /// <summary> Initializes a new instance of EncryptionScopesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public EncryptionScopesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public EncryptionScopesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesOperations.cs
index fd60a919527c3..93c679066a1ae 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The FileServices service client. </summary>
-    public partial class FileServicesClient
+    public partial class FileServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FileServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FileServicesClient for mocking. </summary>
-        protected FileServicesClient()
+        internal FileServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FileServicesOperations for mocking. </summary>
+        protected FileServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FileServicesClient. </summary>
+        /// <summary> Initializes a new instance of FileServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal FileServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal FileServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new FileServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new FileServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal FileServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pi
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileServiceItems>> ListAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.List");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<FileServiceItems>> ListAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileServiceItems> List(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.List");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<FileServiceItems> List(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, FileServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<FileServiceProperties>> SetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, FileServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<FileServiceProperties> SetServiceProperties(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<FileServiceProperties>> GetServicePropertiesA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("FileServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesRestOperations.cs
index cfcb8f01bc40a..382113ab10064 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class FileServicesRestClient
+    internal partial class FileServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class FileServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FileServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of FileServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FileServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public FileServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesOperations.cs
index 4c5fe168de9ed..9e89b3bef5c38 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The FileShares service client. </summary>
-    public partial class FileSharesClient
+    public partial class FileSharesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal FileSharesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of FileSharesClient for mocking. </summary>
-        protected FileSharesClient()
+        internal FileSharesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of FileSharesOperations for mocking. </summary>
+        protected FileSharesOperations()
         {
         }
-        /// <summary> Initializes a new instance of FileSharesClient. </summary>
+        /// <summary> Initializes a new instance of FileSharesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal FileSharesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal FileSharesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new FileSharesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new FileSharesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal FileSharesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipe
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileShare>> CreateAsync(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Create");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<FileShare>> CreateAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileShare> Create(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Create");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<FileShare> Create(string resourceGroupName, string accou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileShare>> UpdateAsync(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Update");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<FileShare>> UpdateAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileShare> Update(string resourceGroupName, string accountName, string shareName, FileShare fileShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Update");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<FileShare> Update(string resourceGroupName, string accou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<FileShare>> GetAsync(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<FileShare>> GetAsync(string resourceGroupName
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<FileShare> Get(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Get");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<FileShare> Get(string resourceGroupName, string accountN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Delete");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string shareName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Delete");
             scope.Start();
             try
             {
@@ -210,7 +210,7 @@ public virtual Response Delete(string resourceGroupName, string accountName, str
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RestoreAsync(string resourceGroupName, string accountName, string shareName, DeletedShare deletedShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Restore");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Restore");
             scope.Start();
             try
             {
@@ -231,7 +231,7 @@ public virtual async Task<Response> RestoreAsync(string resourceGroupName, strin
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Restore(string resourceGroupName, string accountName, string shareName, DeletedShare deletedShare, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("FileSharesClient.Restore");
+            using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.Restore");
             scope.Start();
             try
             {
@@ -263,7 +263,7 @@ public virtual AsyncPageable<FileShareItem> ListAsync(string resourceGroupName,
 
             async Task<Page<FileShareItem>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
@@ -278,7 +278,7 @@ async Task<Page<FileShareItem>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<FileShareItem>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
@@ -313,7 +313,7 @@ public virtual Pageable<FileShareItem> List(string resourceGroupName, string acc
 
             Page<FileShareItem> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
@@ -328,7 +328,7 @@ Page<FileShareItem> FirstPageFunc(int? pageSizeHint)
             }
             Page<FileShareItem> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("FileSharesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("FileSharesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesRestOperations.cs
index 0dd03f7441ed7..fb7a97f97cec0 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/FileSharesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class FileSharesRestClient
+    internal partial class FileSharesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class FileSharesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of FileSharesRestClient. </summary>
+        /// <summary> Initializes a new instance of FileSharesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public FileSharesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public FileSharesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesOperations.cs
index 06e54ebc75956..f10240fe52a32 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The ManagementPolicies service client. </summary>
-    public partial class ManagementPoliciesClient
+    public partial class ManagementPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ManagementPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ManagementPoliciesClient for mocking. </summary>
-        protected ManagementPoliciesClient()
+        internal ManagementPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ManagementPoliciesOperations for mocking. </summary>
+        protected ManagementPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ManagementPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of ManagementPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ManagementPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal ManagementPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new ManagementPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ManagementPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal ManagementPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipel
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementPolicy>> GetAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ManagementPolicy>> GetAsync(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementPolicy> Get(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ManagementPolicy> Get(string resourceGroupName, string a
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ManagementPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, ManagementPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<ManagementPolicy>> CreateOrUpdateAsync(string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ManagementPolicy> CreateOrUpdate(string resourceGroupName, string accountName, ManagementPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<ManagementPolicy> CreateOrUpdate(string resourceGroupNam
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Delete");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ManagementPoliciesOperations.Delete");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesRestOperations.cs
index 63a94e67c2dc3..75d09d982c483 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ManagementPoliciesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class ManagementPoliciesRestClient
+    internal partial class ManagementPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ManagementPoliciesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ManagementPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of ManagementPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ManagementPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public ManagementPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesOperations.cs
index cbc1e1ac0152e..15de86dd99080 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The ObjectReplicationPolicies service client. </summary>
-    public partial class ObjectReplicationPoliciesClient
+    public partial class ObjectReplicationPoliciesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal ObjectReplicationPoliciesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of ObjectReplicationPoliciesClient for mocking. </summary>
-        protected ObjectReplicationPoliciesClient()
+        internal ObjectReplicationPoliciesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of ObjectReplicationPoliciesOperations for mocking. </summary>
+        protected ObjectReplicationPoliciesOperations()
         {
         }
-        /// <summary> Initializes a new instance of ObjectReplicationPoliciesClient. </summary>
+        /// <summary> Initializes a new instance of ObjectReplicationPoliciesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal ObjectReplicationPoliciesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal ObjectReplicationPoliciesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new ObjectReplicationPoliciesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new ObjectReplicationPoliciesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal ObjectReplicationPoliciesClient(ClientDiagnostics clientDiagnostics, Ht
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ObjectReplicationPolicy>> GetAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<ObjectReplicationPolicy>> GetAsync(string res
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ObjectReplicationPolicy> Get(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Get");
             scope.Start();
             try
             {
@@ -86,7 +86,7 @@ public virtual Response<ObjectReplicationPolicy> Get(string resourceGroupName, s
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ObjectReplicationPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, ObjectReplicationPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -107,7 +107,7 @@ public virtual async Task<Response<ObjectReplicationPolicy>> CreateOrUpdateAsync
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ObjectReplicationPolicy> CreateOrUpdate(string resourceGroupName, string accountName, string objectReplicationPolicyId, ObjectReplicationPolicy properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.CreateOrUpdate");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.CreateOrUpdate");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<ObjectReplicationPolicy> CreateOrUpdate(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Delete");
             scope.Start();
             try
             {
@@ -147,7 +147,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string objectReplicationPolicyId, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.Delete");
             scope.Start();
             try
             {
@@ -177,7 +177,7 @@ public virtual AsyncPageable<ObjectReplicationPolicy> ListAsync(string resourceG
 
             async Task<Page<ObjectReplicationPolicy>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual Pageable<ObjectReplicationPolicy> List(string resourceGroupName,
 
             Page<ObjectReplicationPolicy> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesClient.List");
+                using var scope = _clientDiagnostics.CreateScope("ObjectReplicationPoliciesOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesRestOperations.cs
index 0436c82cef6b1..cbf00bf5f551b 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/ObjectReplicationPoliciesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class ObjectReplicationPoliciesRestClient
+    internal partial class ObjectReplicationPoliciesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class ObjectReplicationPoliciesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of ObjectReplicationPoliciesRestClient. </summary>
+        /// <summary> Initializes a new instance of ObjectReplicationPoliciesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public ObjectReplicationPoliciesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public ObjectReplicationPoliciesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/OperationsClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/Operations.cs
similarity index 80%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/OperationsClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/Operations.cs
index 90ba00fab2166..0b13557fd101a 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/OperationsClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/Operations.cs
@@ -15,24 +15,24 @@
 
 namespace Azure.Management.Storage
 {
-    /// <summary> The Operations service client. </summary>
-    public partial class OperationsClient
+    /// <summary> The  service client. </summary>
+    public partial class Operations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal OperationsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of OperationsClient for mocking. </summary>
-        protected OperationsClient()
+        internal RestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of Operations for mocking. </summary>
+        protected Operations()
         {
         }
-        /// <summary> Initializes a new instance of OperationsClient. </summary>
+        /// <summary> Initializes a new instance of Operations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal OperationsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal Operations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new OperationsRestClient(clientDiagnostics, pipeline, endpoint, apiVersion);
+            RestClient = new RestOperations(clientDiagnostics, pipeline, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ public virtual AsyncPageable<Operation> ListAsync(CancellationToken cancellation
         {
             async Task<Page<Operation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
@@ -65,7 +65,7 @@ public virtual Pageable<Operation> List(CancellationToken cancellationToken = de
         {
             Page<Operation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("OperationsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("Operations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsOperations.cs
similarity index 93%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsOperations.cs
index cb3c8329a83bb..2888041444303 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The PrivateEndpointConnections service client. </summary>
-    public partial class PrivateEndpointConnectionsClient
+    public partial class PrivateEndpointConnectionsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateEndpointConnectionsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient for mocking. </summary>
-        protected PrivateEndpointConnectionsClient()
+        internal PrivateEndpointConnectionsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations for mocking. </summary>
+        protected PrivateEndpointConnectionsOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal PrivateEndpointConnectionsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new PrivateEndpointConnectionsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateEndpointConnectionsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal PrivateEndpointConnectionsClient(ClientDiagnostics clientDiagnostics, H
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> GetAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Get");
             scope.Start();
             try
             {
@@ -86,7 +86,7 @@ public virtual Response<PrivateEndpointConnection> Get(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateEndpointConnection>> PutAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Put");
             scope.Start();
             try
             {
@@ -107,7 +107,7 @@ public virtual async Task<Response<PrivateEndpointConnection>> PutAsync(string r
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateEndpointConnection> Put(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection properties, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Put");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Put");
             scope.Start();
             try
             {
@@ -127,7 +127,7 @@ public virtual Response<PrivateEndpointConnection> Put(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Delete");
             scope.Start();
             try
             {
@@ -147,7 +147,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string privateEndpointConnectionName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.Delete");
             scope.Start();
             try
             {
@@ -177,7 +177,7 @@ public virtual AsyncPageable<PrivateEndpointConnection> ListAsync(string resourc
 
             async Task<Page<PrivateEndpointConnection>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.List");
                 scope.Start();
                 try
                 {
@@ -210,7 +210,7 @@ public virtual Pageable<PrivateEndpointConnection> List(string resourceGroupName
 
             Page<PrivateEndpointConnection> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("PrivateEndpointConnectionsOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsRestOperations.cs
index 5ea53a3d9836e..ecfc3ecab5913 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateEndpointConnectionsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class PrivateEndpointConnectionsRestClient
+    internal partial class PrivateEndpointConnectionsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateEndpointConnectionsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateEndpointConnectionsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateEndpointConnectionsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public PrivateEndpointConnectionsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesOperations.cs
similarity index 83%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesOperations.cs
index 05914db38662b..6eda035844046 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The PrivateLinkResources service client. </summary>
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateLinkResourcesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal PrivateLinkResourcesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient for mocking. </summary>
-        protected PrivateLinkResourcesClient()
+        internal PrivateLinkResourcesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations for mocking. </summary>
+        protected PrivateLinkResourcesOperations()
         {
         }
-        /// <summary> Initializes a new instance of PrivateLinkResourcesClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal PrivateLinkResourcesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new PrivateLinkResourcesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new PrivateLinkResourcesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal PrivateLinkResourcesClient(ClientDiagnostics clientDiagnostics, HttpPip
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<PrivateLinkResourceListResult>> ListByStorageAccountAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByStorageAccount");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByStorageAccount");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<PrivateLinkResourceListResult>> ListByStorage
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<PrivateLinkResourceListResult> ListByStorageAccount(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesClient.ListByStorageAccount");
+            using var scope = _clientDiagnostics.CreateScope("PrivateLinkResourcesOperations.ListByStorageAccount");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesRestOperations.cs
similarity index 96%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesRestOperations.cs
index 4bb744f646260..5e90244948b24 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/PrivateLinkResourcesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class PrivateLinkResourcesRestClient
+    internal partial class PrivateLinkResourcesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class PrivateLinkResourcesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of PrivateLinkResourcesRestClient. </summary>
+        /// <summary> Initializes a new instance of PrivateLinkResourcesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public PrivateLinkResourcesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public PrivateLinkResourcesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueOperations.cs
index 9deda26c3f78b..100155fc282f0 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The Queue service client. </summary>
-    public partial class QueueClient
+    public partial class QueueOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal QueueRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of QueueClient for mocking. </summary>
-        protected QueueClient()
+        internal QueueRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of QueueOperations for mocking. </summary>
+        protected QueueOperations()
         {
         }
-        /// <summary> Initializes a new instance of QueueClient. </summary>
+        /// <summary> Initializes a new instance of QueueOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal QueueClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal QueueOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new QueueRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new QueueRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -46,7 +46,7 @@ internal QueueClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageQueue>> CreateAsync(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Create");
             scope.Start();
             try
             {
@@ -67,7 +67,7 @@ public virtual async Task<Response<StorageQueue>> CreateAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageQueue> Create(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Create");
             scope.Start();
             try
             {
@@ -88,7 +88,7 @@ public virtual Response<StorageQueue> Create(string resourceGroupName, string ac
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageQueue>> UpdateAsync(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Update");
             scope.Start();
             try
             {
@@ -109,7 +109,7 @@ public virtual async Task<Response<StorageQueue>> UpdateAsync(string resourceGro
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageQueue> Update(string resourceGroupName, string accountName, string queueName, StorageQueue queue, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Update");
             scope.Start();
             try
             {
@@ -129,7 +129,7 @@ public virtual Response<StorageQueue> Update(string resourceGroupName, string ac
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageQueue>> GetAsync(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Get");
             scope.Start();
             try
             {
@@ -149,7 +149,7 @@ public virtual async Task<Response<StorageQueue>> GetAsync(string resourceGroupN
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageQueue> Get(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Get");
             scope.Start();
             try
             {
@@ -169,7 +169,7 @@ public virtual Response<StorageQueue> Get(string resourceGroupName, string accou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Delete");
             scope.Start();
             try
             {
@@ -189,7 +189,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string queueName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("QueueOperations.Delete");
             scope.Start();
             try
             {
@@ -221,7 +221,7 @@ public virtual AsyncPageable<ListQueue> ListAsync(string resourceGroupName, stri
 
             async Task<Page<ListQueue>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
@@ -236,7 +236,7 @@ async Task<Page<ListQueue>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<ListQueue>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
@@ -271,7 +271,7 @@ public virtual Pageable<ListQueue> List(string resourceGroupName, string account
 
             Page<ListQueue> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
@@ -286,7 +286,7 @@ Page<ListQueue> FirstPageFunc(int? pageSizeHint)
             }
             Page<ListQueue> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("QueueClient.List");
+                using var scope = _clientDiagnostics.CreateScope("QueueOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueRestOperations.cs
index bc3988649de29..ce3b5818d7551 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class QueueRestClient
+    internal partial class QueueRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class QueueRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of QueueRestClient. </summary>
+        /// <summary> Initializes a new instance of QueueRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public QueueRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public QueueRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesOperations.cs
index bcc7de023c2eb..9ab0a3ecc76ee 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The QueueServices service client. </summary>
-    public partial class QueueServicesClient
+    public partial class QueueServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal QueueServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of QueueServicesClient for mocking. </summary>
-        protected QueueServicesClient()
+        internal QueueServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of QueueServicesOperations for mocking. </summary>
+        protected QueueServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of QueueServicesClient. </summary>
+        /// <summary> Initializes a new instance of QueueServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal QueueServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal QueueServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new QueueServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new QueueServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal QueueServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListQueueServices>> ListAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.List");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ListQueueServices>> ListAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListQueueServices> List(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.List");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ListQueueServices> List(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<QueueServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, QueueServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<QueueServiceProperties>> SetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<QueueServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, QueueServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<QueueServiceProperties> SetServiceProperties(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<QueueServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<QueueServiceProperties>> GetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<QueueServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("QueueServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("QueueServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesRestOperations.cs
index 61c8af4cc096e..0f5a2186f5a38 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/QueueServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class QueueServicesRestClient
+    internal partial class QueueServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class QueueServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of QueueServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of QueueServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public QueueServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public QueueServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/OperationsRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/RestOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/OperationsRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/RestOperations.cs
index 17a1d16f985bc..adc770d550854 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/OperationsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/RestOperations.cs
@@ -16,20 +16,20 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class OperationsRestClient
+    internal partial class RestOperations
     {
         private Uri endpoint;
         private string apiVersion;
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of OperationsRestClient. </summary>
+        /// <summary> Initializes a new instance of RestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public OperationsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public RestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             endpoint ??= new Uri("https://management.azure.com");
             if (apiVersion == null)
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusOperations.cs
similarity index 82%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusOperations.cs
index f65c6cda0627f..2ef2381e3367f 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The Skus service client. </summary>
-    public partial class SkusClient
+    public partial class SkusOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal SkusRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of SkusClient for mocking. </summary>
-        protected SkusClient()
+        internal SkusRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of SkusOperations for mocking. </summary>
+        protected SkusOperations()
         {
         }
-        /// <summary> Initializes a new instance of SkusClient. </summary>
+        /// <summary> Initializes a new instance of SkusOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal SkusClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal SkusOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new SkusRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new SkusRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -44,7 +44,7 @@ public virtual AsyncPageable<SkuInformation> ListAsync(CancellationToken cancell
         {
             async Task<Page<SkuInformation>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SkusOperations.List");
                 scope.Start();
                 try
                 {
@@ -66,7 +66,7 @@ public virtual Pageable<SkuInformation> List(CancellationToken cancellationToken
         {
             Page<SkuInformation> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("SkusClient.List");
+                using var scope = _clientDiagnostics.CreateScope("SkusOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusRestOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusRestOperations.cs
index c808e9d4c5216..be6ba7e99e065 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/SkusRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class SkusRestClient
+    internal partial class SkusRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class SkusRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of SkusRestClient. </summary>
+        /// <summary> Initializes a new instance of SkusRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public SkusRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public SkusRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsOperations.cs
index b81224d3893e6..6bf67819bef52 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The StorageAccounts service client. </summary>
-    public partial class StorageAccountsClient
+    public partial class StorageAccountsOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal StorageAccountsRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of StorageAccountsClient for mocking. </summary>
-        protected StorageAccountsClient()
+        internal StorageAccountsRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of StorageAccountsOperations for mocking. </summary>
+        protected StorageAccountsOperations()
         {
         }
-        /// <summary> Initializes a new instance of StorageAccountsClient. </summary>
+        /// <summary> Initializes a new instance of StorageAccountsOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal StorageAccountsClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal StorageAccountsOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new StorageAccountsRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new StorageAccountsRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal StorageAccountsClient(ClientDiagnostics clientDiagnostics, HttpPipeline
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(StorageAccountCheckNameAvailabilityParameters accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -61,7 +61,7 @@ public virtual async Task<Response<CheckNameAvailabilityResult>> CheckNameAvaila
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(StorageAccountCheckNameAvailabilityParameters accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.CheckNameAvailability");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.CheckNameAvailability");
             scope.Start();
             try
             {
@@ -80,7 +80,7 @@ public virtual Response<CheckNameAvailabilityResult> CheckNameAvailability(Stora
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Delete");
             scope.Start();
             try
             {
@@ -99,7 +99,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Delete");
             scope.Start();
             try
             {
@@ -119,7 +119,7 @@ public virtual Response Delete(string resourceGroupName, string accountName, Can
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccount>> GetPropertiesAsync(string resourceGroupName, string accountName, StorageAccountExpand? expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.GetProperties");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.GetProperties");
             scope.Start();
             try
             {
@@ -139,7 +139,7 @@ public virtual async Task<Response<StorageAccount>> GetPropertiesAsync(string re
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccount> GetProperties(string resourceGroupName, string accountName, StorageAccountExpand? expand = null, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.GetProperties");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.GetProperties");
             scope.Start();
             try
             {
@@ -159,7 +159,7 @@ public virtual Response<StorageAccount> GetProperties(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccount>> UpdateAsync(string resourceGroupName, string accountName, StorageAccountUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Update");
             scope.Start();
             try
             {
@@ -179,7 +179,7 @@ public virtual async Task<Response<StorageAccount>> UpdateAsync(string resourceG
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccount> Update(string resourceGroupName, string accountName, StorageAccountUpdateParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.Update");
             scope.Start();
             try
             {
@@ -198,7 +198,7 @@ public virtual Response<StorageAccount> Update(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccountListKeysResult>> ListKeysAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -217,7 +217,7 @@ public virtual async Task<Response<StorageAccountListKeysResult>> ListKeysAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccountListKeysResult> ListKeys(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListKeys");
             scope.Start();
             try
             {
@@ -237,7 +237,7 @@ public virtual Response<StorageAccountListKeysResult> ListKeys(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<StorageAccountListKeysResult>> RegenerateKeyAsync(string resourceGroupName, string accountName, StorageAccountRegenerateKeyParameters regenerateKey, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RegenerateKey");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RegenerateKey");
             scope.Start();
             try
             {
@@ -257,7 +257,7 @@ public virtual async Task<Response<StorageAccountListKeysResult>> RegenerateKeyA
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<StorageAccountListKeysResult> RegenerateKey(string resourceGroupName, string accountName, StorageAccountRegenerateKeyParameters regenerateKey, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RegenerateKey");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RegenerateKey");
             scope.Start();
             try
             {
@@ -277,7 +277,7 @@ public virtual Response<StorageAccountListKeysResult> RegenerateKey(string resou
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListAccountSasResponse>> ListAccountSASAsync(string resourceGroupName, string accountName, AccountSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListAccountSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListAccountSAS");
             scope.Start();
             try
             {
@@ -297,7 +297,7 @@ public virtual async Task<Response<ListAccountSasResponse>> ListAccountSASAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListAccountSasResponse> ListAccountSAS(string resourceGroupName, string accountName, AccountSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListAccountSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListAccountSAS");
             scope.Start();
             try
             {
@@ -317,7 +317,7 @@ public virtual Response<ListAccountSasResponse> ListAccountSAS(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListServiceSasResponse>> ListServiceSASAsync(string resourceGroupName, string accountName, ServiceSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListServiceSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListServiceSAS");
             scope.Start();
             try
             {
@@ -337,7 +337,7 @@ public virtual async Task<Response<ListServiceSasResponse>> ListServiceSASAsync(
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListServiceSasResponse> ListServiceSAS(string resourceGroupName, string accountName, ServiceSasParameters parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListServiceSAS");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListServiceSAS");
             scope.Start();
             try
             {
@@ -356,7 +356,7 @@ public virtual Response<ListServiceSasResponse> ListServiceSAS(string resourceGr
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> RevokeUserDelegationKeysAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RevokeUserDelegationKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RevokeUserDelegationKeys");
             scope.Start();
             try
             {
@@ -375,7 +375,7 @@ public virtual async Task<Response> RevokeUserDelegationKeysAsync(string resourc
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response RevokeUserDelegationKeys(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.RevokeUserDelegationKeys");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.RevokeUserDelegationKeys");
             scope.Start();
             try
             {
@@ -394,7 +394,7 @@ public virtual AsyncPageable<StorageAccount> ListAsync(CancellationToken cancell
         {
             async Task<Page<StorageAccount>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -409,7 +409,7 @@ async Task<Page<StorageAccount>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<StorageAccount>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -431,7 +431,7 @@ public virtual Pageable<StorageAccount> List(CancellationToken cancellationToken
         {
             Page<StorageAccount> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -446,7 +446,7 @@ Page<StorageAccount> FirstPageFunc(int? pageSizeHint)
             }
             Page<StorageAccount> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.List");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.List");
                 scope.Start();
                 try
                 {
@@ -474,7 +474,7 @@ public virtual AsyncPageable<StorageAccount> ListByResourceGroupAsync(string res
 
             async Task<Page<StorageAccount>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -502,7 +502,7 @@ public virtual Pageable<StorageAccount> ListByResourceGroup(string resourceGroup
 
             Page<StorageAccount> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.ListByResourceGroup");
+                using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.ListByResourceGroup");
                 scope.Start();
                 try
                 {
@@ -538,7 +538,7 @@ public virtual async Task<StorageAccountsCreateOperation> StartCreateAsync(strin
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartCreate");
             scope.Start();
             try
             {
@@ -572,7 +572,7 @@ public virtual StorageAccountsCreateOperation StartCreate(string resourceGroupNa
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartCreate");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartCreate");
             scope.Start();
             try
             {
@@ -601,7 +601,7 @@ public virtual async Task<StorageAccountsFailoverOperation> StartFailoverAsync(s
                 throw new ArgumentNullException(nameof(accountName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartFailover");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartFailover");
             scope.Start();
             try
             {
@@ -630,7 +630,7 @@ public virtual StorageAccountsFailoverOperation StartFailover(string resourceGro
                 throw new ArgumentNullException(nameof(accountName));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartFailover");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartFailover");
             scope.Start();
             try
             {
@@ -664,7 +664,7 @@ public virtual async Task<StorageAccountsRestoreBlobRangesOperation> StartRestor
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartRestoreBlobRanges");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartRestoreBlobRanges");
             scope.Start();
             try
             {
@@ -698,7 +698,7 @@ public virtual StorageAccountsRestoreBlobRangesOperation StartRestoreBlobRanges(
                 throw new ArgumentNullException(nameof(parameters));
             }
 
-            using var scope = _clientDiagnostics.CreateScope("StorageAccountsClient.StartRestoreBlobRanges");
+            using var scope = _clientDiagnostics.CreateScope("StorageAccountsOperations.StartRestoreBlobRanges");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsRestOperations.cs
index c58d4fb414d5a..508a8a6443e16 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageAccountsRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class StorageAccountsRestClient
+    internal partial class StorageAccountsRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class StorageAccountsRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of StorageAccountsRestClient. </summary>
+        /// <summary> Initializes a new instance of StorageAccountsRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public StorageAccountsRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public StorageAccountsRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageManagementClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageManagementClient.cs
index c1988c516631d..7452a49733b3d 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageManagementClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/StorageManagementClient.cs
@@ -53,106 +53,55 @@ public StorageManagementClient(Uri endpoint, string subscriptionId, TokenCredent
             _subscriptionId = subscriptionId;
         }
 
-        /// <summary> Creates a new instance of OperationsClient. </summary>
-        public virtual OperationsClient GetOperationsClient()
-        {
-            return new OperationsClient(_clientDiagnostics, _pipeline, _endpoint);
-        }
+        /// <summary> Returns an instance of Operations. </summary>
+        public virtual Operations Operations => new Operations(_clientDiagnostics, _pipeline, _endpoint);
 
-        /// <summary> Creates a new instance of SkusClient. </summary>
-        public virtual SkusClient GetSkusClient()
-        {
-            return new SkusClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of SkusOperations. </summary>
+        public virtual SkusOperations Skus => new SkusOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of StorageAccountsClient. </summary>
-        public virtual StorageAccountsClient GetStorageAccountsClient()
-        {
-            return new StorageAccountsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of StorageAccountsOperations. </summary>
+        public virtual StorageAccountsOperations StorageAccounts => new StorageAccountsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of UsagesClient. </summary>
-        public virtual UsagesClient GetUsagesClient()
-        {
-            return new UsagesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of UsagesOperations. </summary>
+        public virtual UsagesOperations Usages => new UsagesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ManagementPoliciesClient. </summary>
-        public virtual ManagementPoliciesClient GetManagementPoliciesClient()
-        {
-            return new ManagementPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ManagementPoliciesOperations. </summary>
+        public virtual ManagementPoliciesOperations ManagementPolicies => new ManagementPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateEndpointConnectionsClient. </summary>
-        public virtual PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient()
-        {
-            return new PrivateEndpointConnectionsClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateEndpointConnectionsOperations. </summary>
+        public virtual PrivateEndpointConnectionsOperations PrivateEndpointConnections => new PrivateEndpointConnectionsOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of PrivateLinkResourcesClient. </summary>
-        public virtual PrivateLinkResourcesClient GetPrivateLinkResourcesClient()
-        {
-            return new PrivateLinkResourcesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of PrivateLinkResourcesOperations. </summary>
+        public virtual PrivateLinkResourcesOperations PrivateLinkResources => new PrivateLinkResourcesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of ObjectReplicationPoliciesClient. </summary>
-        public virtual ObjectReplicationPoliciesClient GetObjectReplicationPoliciesClient()
-        {
-            return new ObjectReplicationPoliciesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of ObjectReplicationPoliciesOperations. </summary>
+        public virtual ObjectReplicationPoliciesOperations ObjectReplicationPolicies => new ObjectReplicationPoliciesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of EncryptionScopesClient. </summary>
-        public virtual EncryptionScopesClient GetEncryptionScopesClient()
-        {
-            return new EncryptionScopesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of EncryptionScopesOperations. </summary>
+        public virtual EncryptionScopesOperations EncryptionScopes => new EncryptionScopesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BlobServicesClient. </summary>
-        public virtual BlobServicesClient GetBlobServicesClient()
-        {
-            return new BlobServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BlobServicesOperations. </summary>
+        public virtual BlobServicesOperations BlobServices => new BlobServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of BlobContainersClient. </summary>
-        public virtual BlobContainersClient GetBlobContainersClient()
-        {
-            return new BlobContainersClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of BlobContainersOperations. </summary>
+        public virtual BlobContainersOperations BlobContainers => new BlobContainersOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FileServicesClient. </summary>
-        public virtual FileServicesClient GetFileServicesClient()
-        {
-            return new FileServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FileServicesOperations. </summary>
+        public virtual FileServicesOperations FileServices => new FileServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of FileSharesClient. </summary>
-        public virtual FileSharesClient GetFileSharesClient()
-        {
-            return new FileSharesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of FileSharesOperations. </summary>
+        public virtual FileSharesOperations FileShares => new FileSharesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of QueueServicesClient. </summary>
-        public virtual QueueServicesClient GetQueueServicesClient()
-        {
-            return new QueueServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of QueueServicesOperations. </summary>
+        public virtual QueueServicesOperations QueueServices => new QueueServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of QueueClient. </summary>
-        public virtual QueueClient GetQueueClient()
-        {
-            return new QueueClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of QueueOperations. </summary>
+        public virtual QueueOperations Queue => new QueueOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of TableServicesClient. </summary>
-        public virtual TableServicesClient GetTableServicesClient()
-        {
-            return new TableServicesClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of TableServicesOperations. </summary>
+        public virtual TableServicesOperations TableServices => new TableServicesOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
 
-        /// <summary> Creates a new instance of TableClient. </summary>
-        public virtual TableClient GetTableClient()
-        {
-            return new TableClient(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
-        }
+        /// <summary> Returns an instance of TableOperations. </summary>
+        public virtual TableOperations Table => new TableOperations(_clientDiagnostics, _pipeline, _subscriptionId, _endpoint);
     }
 }
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableOperations.cs
similarity index 95%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableOperations.cs
index 2db5096ce1f07..a7c67001a548a 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The Table service client. </summary>
-    public partial class TableClient
+    public partial class TableOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TableRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TableClient for mocking. </summary>
-        protected TableClient()
+        internal TableRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TableOperations for mocking. </summary>
+        protected TableOperations()
         {
         }
-        /// <summary> Initializes a new instance of TableClient. </summary>
+        /// <summary> Initializes a new instance of TableOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal TableClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal TableOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new TableRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new TableRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -45,7 +45,7 @@ internal TableClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Table>> CreateAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Create");
             scope.Start();
             try
             {
@@ -65,7 +65,7 @@ public virtual async Task<Response<Table>> CreateAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Table> Create(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Create");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Create");
             scope.Start();
             try
             {
@@ -85,7 +85,7 @@ public virtual Response<Table> Create(string resourceGroupName, string accountNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Table>> UpdateAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Update");
             scope.Start();
             try
             {
@@ -105,7 +105,7 @@ public virtual async Task<Response<Table>> UpdateAsync(string resourceGroupName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Table> Update(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Update");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Update");
             scope.Start();
             try
             {
@@ -125,7 +125,7 @@ public virtual Response<Table> Update(string resourceGroupName, string accountNa
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<Table>> GetAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Get");
             scope.Start();
             try
             {
@@ -145,7 +145,7 @@ public virtual async Task<Response<Table>> GetAsync(string resourceGroupName, st
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<Table> Get(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Get");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Get");
             scope.Start();
             try
             {
@@ -165,7 +165,7 @@ public virtual Response<Table> Get(string resourceGroupName, string accountName,
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response> DeleteAsync(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Delete");
             scope.Start();
             try
             {
@@ -185,7 +185,7 @@ public virtual async Task<Response> DeleteAsync(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response Delete(string resourceGroupName, string accountName, string tableName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableClient.Delete");
+            using var scope = _clientDiagnostics.CreateScope("TableOperations.Delete");
             scope.Start();
             try
             {
@@ -215,7 +215,7 @@ public virtual AsyncPageable<Table> ListAsync(string resourceGroupName, string a
 
             async Task<Page<Table>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
@@ -230,7 +230,7 @@ async Task<Page<Table>> FirstPageFunc(int? pageSizeHint)
             }
             async Task<Page<Table>> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
@@ -263,7 +263,7 @@ public virtual Pageable<Table> List(string resourceGroupName, string accountName
 
             Page<Table> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
@@ -278,7 +278,7 @@ Page<Table> FirstPageFunc(int? pageSizeHint)
             }
             Page<Table> NextPageFunc(string nextLink, int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("TableClient.List");
+                using var scope = _clientDiagnostics.CreateScope("TableOperations.List");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableRestOperations.cs
similarity index 99%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableRestOperations.cs
index b32c77262f67e..0d3ef3c84c222 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class TableRestClient
+    internal partial class TableRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class TableRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TableRestClient. </summary>
+        /// <summary> Initializes a new instance of TableRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public TableRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public TableRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesOperations.cs
similarity index 91%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesOperations.cs
index f7c6f8ebfec6f..e845bea4746f0 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesOperations.cs
@@ -15,24 +15,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The TableServices service client. </summary>
-    public partial class TableServicesClient
+    public partial class TableServicesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal TableServicesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of TableServicesClient for mocking. </summary>
-        protected TableServicesClient()
+        internal TableServicesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of TableServicesOperations for mocking. </summary>
+        protected TableServicesOperations()
         {
         }
-        /// <summary> Initializes a new instance of TableServicesClient. </summary>
+        /// <summary> Initializes a new instance of TableServicesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal TableServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal TableServicesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new TableServicesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new TableServicesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -43,7 +43,7 @@ internal TableServicesClient(ClientDiagnostics clientDiagnostics, HttpPipeline p
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<ListTableServices>> ListAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.List");
             scope.Start();
             try
             {
@@ -62,7 +62,7 @@ public virtual async Task<Response<ListTableServices>> ListAsync(string resource
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<ListTableServices> List(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.List");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.List");
             scope.Start();
             try
             {
@@ -82,7 +82,7 @@ public virtual Response<ListTableServices> List(string resourceGroupName, string
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TableServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, TableServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -102,7 +102,7 @@ public virtual async Task<Response<TableServiceProperties>> SetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TableServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, TableServiceProperties parameters, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.SetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.SetServiceProperties");
             scope.Start();
             try
             {
@@ -121,7 +121,7 @@ public virtual Response<TableServiceProperties> SetServiceProperties(string reso
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual async Task<Response<TableServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
@@ -140,7 +140,7 @@ public virtual async Task<Response<TableServiceProperties>> GetServiceProperties
         /// <param name="cancellationToken"> The cancellation token to use. </param>
         public virtual Response<TableServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, CancellationToken cancellationToken = default)
         {
-            using var scope = _clientDiagnostics.CreateScope("TableServicesClient.GetServiceProperties");
+            using var scope = _clientDiagnostics.CreateScope("TableServicesOperations.GetServiceProperties");
             scope.Start();
             try
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesRestOperations.cs
similarity index 98%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesRestOperations.cs
index 3d009e48563b2..f9bec25691deb 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/TableServicesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class TableServicesRestClient
+    internal partial class TableServicesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class TableServicesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of TableServicesRestClient. </summary>
+        /// <summary> Initializes a new instance of TableServicesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public TableServicesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public TableServicesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesOperations.cs
similarity index 84%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesOperations.cs
index c38fe183b74ec..a4b8774cc4c51 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesOperations.cs
@@ -16,24 +16,24 @@
 namespace Azure.Management.Storage
 {
     /// <summary> The Usages service client. </summary>
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
         private readonly ClientDiagnostics _clientDiagnostics;
         private readonly HttpPipeline _pipeline;
-        internal UsagesRestClient RestClient { get; }
-        /// <summary> Initializes a new instance of UsagesClient for mocking. </summary>
-        protected UsagesClient()
+        internal UsagesRestOperations RestClient { get; }
+        /// <summary> Initializes a new instance of UsagesOperations for mocking. </summary>
+        protected UsagesOperations()
         {
         }
-        /// <summary> Initializes a new instance of UsagesClient. </summary>
+        /// <summary> Initializes a new instance of UsagesOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
-        internal UsagesClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        internal UsagesOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
-            RestClient = new UsagesRestClient(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
+            RestClient = new UsagesRestOperations(clientDiagnostics, pipeline, subscriptionId, endpoint, apiVersion);
             _clientDiagnostics = clientDiagnostics;
             _pipeline = pipeline;
         }
@@ -50,7 +50,7 @@ public virtual AsyncPageable<Usage> ListByLocationAsync(string location, Cancell
 
             async Task<Page<Usage>> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
@@ -78,7 +78,7 @@ public virtual Pageable<Usage> ListByLocation(string location, CancellationToken
 
             Page<Usage> FirstPageFunc(int? pageSizeHint)
             {
-                using var scope = _clientDiagnostics.CreateScope("UsagesClient.ListByLocation");
+                using var scope = _clientDiagnostics.CreateScope("UsagesOperations.ListByLocation");
                 scope.Start();
                 try
                 {
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesRestClient.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesRestOperations.cs
similarity index 94%
rename from sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesRestClient.cs
rename to sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesRestOperations.cs
index 54127879e24cf..5a18823a3c5e6 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesRestClient.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/src/Generated/UsagesRestOperations.cs
@@ -16,7 +16,7 @@
 
 namespace Azure.Management.Storage
 {
-    internal partial class UsagesRestClient
+    internal partial class UsagesRestOperations
     {
         private string subscriptionId;
         private Uri endpoint;
@@ -24,14 +24,14 @@ internal partial class UsagesRestClient
         private ClientDiagnostics _clientDiagnostics;
         private HttpPipeline _pipeline;
 
-        /// <summary> Initializes a new instance of UsagesRestClient. </summary>
+        /// <summary> Initializes a new instance of UsagesRestOperations. </summary>
         /// <param name="clientDiagnostics"> The handler for diagnostic messaging in the client. </param>
         /// <param name="pipeline"> The HTTP pipeline for sending and receiving REST requests and responses. </param>
         /// <param name="subscriptionId"> The ID of the target subscription. </param>
         /// <param name="endpoint"> server parameter. </param>
         /// <param name="apiVersion"> Api Version. </param>
         /// <exception cref="ArgumentNullException"> This occurs when one of the required arguments is null. </exception>
-        public UsagesRestClient(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
+        public UsagesRestOperations(ClientDiagnostics clientDiagnostics, HttpPipeline pipeline, string subscriptionId, Uri endpoint = null, string apiVersion = "2019-06-01")
         {
             if (subscriptionId == null)
             {

From 20a1cd617ad13a75c2fbe04263057652c4605437 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 12 Jun 2020 10:09:00 -0700
Subject: [PATCH 2/2] Fixes

---
 .../ManagementRecordedTestBase.cs             |    4 +-
 ...Manager.AppConfiguration.netstandard2.0.cs |   84 +-
 ....ResourceManager.Compute.netstandard2.0.cs |  794 +++---
 ...esourceManager.EventHubs.netstandard2.0.cs |  138 +-
 ...ResourceManager.KeyVault.netstandard2.0.cs |   66 +-
 .../tests/VaultOperationsTestsBase.cs         |   18 +-
 ....ResourceManager.Network.netstandard2.0.cs | 2274 ++++++++---------
 ...esourceManager.Resources.netstandard2.0.cs |  486 ++--
 ....ResourceManager.Storage.netstandard2.0.cs |  154 +-
 .../api/Azure.Graph.Rbac.netstandard2.0.cs    |   54 +-
 ...Azure.Management.Compute.netstandard2.0.cs |  794 +++---
 ...Azure.Management.Network.netstandard2.0.cs | 2274 ++++++++---------
 ...ure.Management.Resources.netstandard2.0.cs |  162 +-
 ...Azure.Management.Storage.netstandard2.0.cs |  154 +-
 14 files changed, 3728 insertions(+), 3728 deletions(-)

diff --git a/common/ManagementTestShared/ManagementRecordedTestBase.cs b/common/ManagementTestShared/ManagementRecordedTestBase.cs
index 1f384c614a968..7b325969f8a26 100644
--- a/common/ManagementTestShared/ManagementRecordedTestBase.cs
+++ b/common/ManagementTestShared/ManagementRecordedTestBase.cs
@@ -56,7 +56,7 @@ protected async Task CleanupResourceGroupsAsync()
                 var resourceGroupsClient = new ResourcesManagementClient(
                     TestEnvironment.SubscriptionId,
                     TestEnvironment.Credential,
-                    new ResourcesManagementClientOptions()).GetResourceGroupsClient();
+                    new ResourcesManagementClientOptions()).ResourceGroups;
                 foreach (var resourceGroup in CleanupPolicy.ResourceGroupsCreated)
                 {
                     await resourceGroupsClient.StartDeleteAsync(resourceGroup);
@@ -64,7 +64,7 @@ protected async Task CleanupResourceGroupsAsync()
             }
         }
 
-        protected async Task<string> GetFirstUsableLocationAsync(ProvidersClient providersClient, string resourceProviderNamespace, string resourceType)
+        protected async Task<string> GetFirstUsableLocationAsync(ProvidersOperations providersClient, string resourceProviderNamespace, string resourceType)
         {
             var provider = (await providersClient.GetAsync(resourceProviderNamespace)).Value;
             return provider.ResourceTypes.Where(
diff --git a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/api/Azure.ResourceManager.AppConfiguration.netstandard2.0.cs b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/api/Azure.ResourceManager.AppConfiguration.netstandard2.0.cs
index 5c451277d7a39..410f7b4a6de8e 100644
--- a/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/api/Azure.ResourceManager.AppConfiguration.netstandard2.0.cs
+++ b/sdk/appconfiguration/Azure.ResourceManager.AppConfiguration/api/Azure.ResourceManager.AppConfiguration.netstandard2.0.cs
@@ -5,37 +5,15 @@ public partial class AppConfigurationManagementClient
         protected AppConfigurationManagementClient() { }
         public AppConfigurationManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.AppConfiguration.AppConfigurationManagementClientOptions options = null) { }
         public AppConfigurationManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.AppConfiguration.AppConfigurationManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresClient GetConfigurationStoresClient() { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.PrivateLinkResourcesClient GetPrivateLinkResourcesClient() { throw null; }
+        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresOperations ConfigurationStores { get { throw null; } }
+        public virtual Azure.ResourceManager.AppConfiguration.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsOperations PrivateEndpointConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.AppConfiguration.PrivateLinkResourcesOperations PrivateLinkResources { get { throw null; } }
     }
     public partial class AppConfigurationManagementClientOptions : Azure.Core.ClientOptions
     {
         public AppConfigurationManagementClientOptions() { }
     }
-    public partial class ConfigurationStoresClient
-    {
-        protected ConfigurationStoresClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> Get(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore>> GetAsync(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> List(string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> ListAsync(string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> ListByResourceGroup(string resourceGroupName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> ListByResourceGroupAsync(string resourceGroupName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.ApiKey> ListKeys(string resourceGroupName, string configStoreName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.ApiKey> ListKeysAsync(string resourceGroupName, string configStoreName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.KeyValue> ListKeyValue(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ListKeyValueParameters listKeyValueParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.KeyValue>> ListKeyValueAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ListKeyValueParameters listKeyValueParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ApiKey> RegenerateKey(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.RegenerateKeyParameters regenerateKeyParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ApiKey>> RegenerateKeyAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.RegenerateKeyParameters regenerateKeyParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresCreateOperation StartCreate(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore configStoreCreationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.ConfigurationStoresCreateOperation> StartCreateAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore configStoreCreationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresDeleteOperation StartDelete(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.ConfigurationStoresDeleteOperation> StartDeleteAsync(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresUpdateOperation StartUpdate(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStoreUpdateParameters configStoreUpdateParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.ConfigurationStoresUpdateOperation> StartUpdateAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStoreUpdateParameters configStoreUpdateParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ConfigurationStoresCreateOperation : Azure.Operation<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore>
     {
         internal ConfigurationStoresCreateOperation() { }
@@ -62,6 +40,28 @@ internal ConfigurationStoresDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ConfigurationStoresOperations
+    {
+        protected ConfigurationStoresOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> Get(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore>> GetAsync(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> List(string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> ListAsync(string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> ListByResourceGroup(string resourceGroupName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore> ListByResourceGroupAsync(string resourceGroupName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.ApiKey> ListKeys(string resourceGroupName, string configStoreName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.ApiKey> ListKeysAsync(string resourceGroupName, string configStoreName, string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.KeyValue> ListKeyValue(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ListKeyValueParameters listKeyValueParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.KeyValue>> ListKeyValueAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ListKeyValueParameters listKeyValueParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ApiKey> RegenerateKey(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.RegenerateKeyParameters regenerateKeyParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ApiKey>> RegenerateKeyAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.RegenerateKeyParameters regenerateKeyParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresCreateOperation StartCreate(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore configStoreCreationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.ConfigurationStoresCreateOperation> StartCreateAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore configStoreCreationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresDeleteOperation StartDelete(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.ConfigurationStoresDeleteOperation> StartDeleteAsync(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.AppConfiguration.ConfigurationStoresUpdateOperation StartUpdate(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStoreUpdateParameters configStoreUpdateParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.ConfigurationStoresUpdateOperation> StartUpdateAsync(string resourceGroupName, string configStoreName, Azure.ResourceManager.AppConfiguration.Models.ConfigurationStoreUpdateParameters configStoreUpdateParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ConfigurationStoresUpdateOperation : Azure.Operation<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore>
     {
         internal ConfigurationStoresUpdateOperation() { }
@@ -75,26 +75,14 @@ internal ConfigurationStoresUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.ConfigurationStore>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.NameAvailabilityStatus> CheckNameAvailability(Azure.ResourceManager.AppConfiguration.Models.CheckNameAvailabilityParameters checkNameAvailabilityParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.NameAvailabilityStatus>> CheckNameAvailabilityAsync(Azure.ResourceManager.AppConfiguration.Models.CheckNameAvailabilityParameters checkNameAvailabilityParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.OperationDefinition> List(string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.OperationDefinition> ListAsync(string skipToken = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointConnectionsClient
-    {
-        protected PrivateEndpointConnectionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection> Get(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection>> GetAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection> ListByConfigurationStore(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection> ListByConfigurationStoreAsync(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection privateEndpointConnection, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection privateEndpointConnection, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsDeleteOperation StartDelete(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class PrivateEndpointConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection>
     {
         internal PrivateEndpointConnectionsCreateOrUpdateOperation() { }
@@ -121,9 +109,21 @@ internal PrivateEndpointConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateEndpointConnectionsOperations
+    {
+        protected PrivateEndpointConnectionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection> Get(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection>> GetAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection> ListByConfigurationStore(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection> ListByConfigurationStoreAsync(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection privateEndpointConnection, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, Azure.ResourceManager.AppConfiguration.Models.PrivateEndpointConnection privateEndpointConnection, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsDeleteOperation StartDelete(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.AppConfiguration.PrivateEndpointConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string configStoreName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateLinkResourcesOperations
     {
-        protected PrivateLinkResourcesClient() { }
+        protected PrivateLinkResourcesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.AppConfiguration.Models.PrivateLinkResource> Get(string resourceGroupName, string configStoreName, string groupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.AppConfiguration.Models.PrivateLinkResource>> GetAsync(string resourceGroupName, string configStoreName, string groupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.AppConfiguration.Models.PrivateLinkResource> ListByConfigurationStore(string resourceGroupName, string configStoreName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
diff --git a/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs b/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs
index a66eab2f78c15..2954975290329 100644
--- a/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs
+++ b/sdk/compute/Azure.ResourceManager.Compute/api/Azure.ResourceManager.Compute.netstandard2.0.cs
@@ -1,8 +1,8 @@
 namespace Azure.ResourceManager.Compute
 {
-    public partial class AvailabilitySetsClient
+    public partial class AvailabilitySetsOperations
     {
-        protected AvailabilitySetsClient() { }
+        protected AvailabilitySetsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.AvailabilitySet> CreateOrUpdate(string resourceGroupName, string availabilitySetName, Azure.ResourceManager.Compute.Models.AvailabilitySet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.AvailabilitySet>> CreateOrUpdateAsync(string resourceGroupName, string availabilitySetName, Azure.ResourceManager.Compute.Models.AvailabilitySet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string availabilitySetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -23,55 +23,41 @@ public partial class ComputeManagementClient
         protected ComputeManagementClient() { }
         public ComputeManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Compute.ComputeManagementClientOptions options = null) { }
         public ComputeManagementClient(System.Uri endpoint, string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Compute.ComputeManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.Compute.AvailabilitySetsClient GetAvailabilitySetsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.ContainerServicesClient GetContainerServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.DedicatedHostGroupsClient GetDedicatedHostGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.DedicatedHostsClient GetDedicatedHostsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsClient GetDiskEncryptionSetsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.DisksClient GetDisksClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleriesClient GetGalleriesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationsClient GetGalleryApplicationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsClient GetGalleryApplicationVersionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImagesClient GetGalleryImagesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsClient GetGalleryImageVersionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.ImagesClient GetImagesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.LogAnalyticsClient GetLogAnalyticsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.ProximityPlacementGroupsClient GetProximityPlacementGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.ResourceSkusClient GetResourceSkusClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.SnapshotsClient GetSnapshotsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.SshPublicKeysClient GetSshPublicKeysClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.UsageClient GetUsageClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionImagesClient GetVirtualMachineExtensionImagesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsClient GetVirtualMachineExtensionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineImagesClient GetVirtualMachineImagesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineRunCommandsClient GetVirtualMachineRunCommandsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsClient GetVirtualMachineScaleSetExtensionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetRollingUpgradesClient GetVirtualMachineScaleSetRollingUpgradesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsClient GetVirtualMachineScaleSetsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetVMExtensionsClient GetVirtualMachineScaleSetVMExtensionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetVMsClient GetVirtualMachineScaleSetVMsClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesClient GetVirtualMachinesClient() { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineSizesClient GetVirtualMachineSizesClient() { throw null; }
+        public virtual Azure.ResourceManager.Compute.AvailabilitySetsOperations AvailabilitySets { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.ContainerServicesOperations ContainerServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.DedicatedHostGroupsOperations DedicatedHostGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.DedicatedHostsOperations DedicatedHosts { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsOperations DiskEncryptionSets { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.DisksOperations Disks { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.GalleriesOperations Galleries { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationsOperations GalleryApplications { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsOperations GalleryApplicationVersions { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.GalleryImagesOperations GalleryImages { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsOperations GalleryImageVersions { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.ImagesOperations Images { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.LogAnalyticsOperations LogAnalytics { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.ProximityPlacementGroupsOperations ProximityPlacementGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.ResourceSkusOperations ResourceSkus { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.SnapshotsOperations Snapshots { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.SshPublicKeysOperations SshPublicKeys { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.UsageOperations Usage { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionImagesOperations VirtualMachineExtensionImages { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsOperations VirtualMachineExtensions { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineImagesOperations VirtualMachineImages { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineRunCommandsOperations VirtualMachineRunCommands { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesOperations VirtualMachines { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsOperations VirtualMachineScaleSetExtensions { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetRollingUpgradesOperations VirtualMachineScaleSetRollingUpgrades { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsOperations VirtualMachineScaleSets { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetVMExtensionsOperations VirtualMachineScaleSetVMExtensions { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetVMsOperations VirtualMachineScaleSetVMs { get { throw null; } }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineSizesOperations VirtualMachineSizes { get { throw null; } }
     }
     public partial class ComputeManagementClientOptions : Azure.Core.ClientOptions
     {
         public ComputeManagementClientOptions() { }
     }
-    public partial class ContainerServicesClient
-    {
-        protected ContainerServicesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.ContainerService> Get(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.ContainerService>> GetAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.ContainerService> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.ContainerService> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.ContainerService> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.ContainerService> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.ContainerServicesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string containerServiceName, Azure.ResourceManager.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ContainerServicesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string containerServiceName, Azure.ResourceManager.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.ContainerServicesDeleteOperation StartDelete(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ContainerServicesDeleteOperation> StartDeleteAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ContainerServicesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.ContainerService>
     {
         internal ContainerServicesCreateOrUpdateOperation() { }
@@ -98,9 +84,23 @@ internal ContainerServicesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DedicatedHostGroupsClient
+    public partial class ContainerServicesOperations
     {
-        protected DedicatedHostGroupsClient() { }
+        protected ContainerServicesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.ContainerService> Get(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.ContainerService>> GetAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.ContainerService> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.ContainerService> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.ContainerService> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.ContainerService> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.ContainerServicesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string containerServiceName, Azure.ResourceManager.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ContainerServicesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string containerServiceName, Azure.ResourceManager.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.ContainerServicesDeleteOperation StartDelete(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ContainerServicesDeleteOperation> StartDeleteAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class DedicatedHostGroupsOperations
+    {
+        protected DedicatedHostGroupsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHostGroup> CreateOrUpdate(string resourceGroupName, string hostGroupName, Azure.ResourceManager.Compute.Models.DedicatedHostGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHostGroup>> CreateOrUpdateAsync(string resourceGroupName, string hostGroupName, Azure.ResourceManager.Compute.Models.DedicatedHostGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -114,20 +114,6 @@ protected DedicatedHostGroupsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHostGroup> Update(string resourceGroupName, string hostGroupName, Azure.ResourceManager.Compute.Models.DedicatedHostGroupUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHostGroup>> UpdateAsync(string resourceGroupName, string hostGroupName, Azure.ResourceManager.Compute.Models.DedicatedHostGroupUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DedicatedHostsClient
-    {
-        protected DedicatedHostsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHost> Get(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHost>> GetAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.DedicatedHost> ListByHostGroup(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.DedicatedHost> ListByHostGroupAsync(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DedicatedHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DedicatedHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DedicatedHostsDeleteOperation StartDelete(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DedicatedHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DedicatedHostsUpdateOperation StartUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DedicatedHostsUpdateOperation> StartUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DedicatedHostsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.DedicatedHost>
     {
         internal DedicatedHostsCreateOrUpdateOperation() { }
@@ -154,6 +140,20 @@ internal DedicatedHostsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DedicatedHostsOperations
+    {
+        protected DedicatedHostsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHost> Get(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHost>> GetAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.DedicatedHost> ListByHostGroup(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.DedicatedHost> ListByHostGroupAsync(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DedicatedHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DedicatedHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DedicatedHostsDeleteOperation StartDelete(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DedicatedHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DedicatedHostsUpdateOperation StartUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DedicatedHostsUpdateOperation> StartUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.ResourceManager.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DedicatedHostsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.DedicatedHost>
     {
         internal DedicatedHostsUpdateOperation() { }
@@ -167,22 +167,6 @@ internal DedicatedHostsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHost>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.DedicatedHost>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DiskEncryptionSetsClient
-    {
-        protected DiskEncryptionSetsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> Get(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.DiskEncryptionSet>> GetAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DiskEncryptionSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsDeleteOperation StartDelete(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DiskEncryptionSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsUpdateOperation StartUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DiskEncryptionSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DiskEncryptionSetsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.DiskEncryptionSet>
     {
         internal DiskEncryptionSetsCreateOrUpdateOperation() { }
@@ -209,6 +193,22 @@ internal DiskEncryptionSetsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DiskEncryptionSetsOperations
+    {
+        protected DiskEncryptionSetsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> Get(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.DiskEncryptionSet>> GetAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.DiskEncryptionSet> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DiskEncryptionSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsDeleteOperation StartDelete(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DiskEncryptionSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DiskEncryptionSetsUpdateOperation StartUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DiskEncryptionSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.ResourceManager.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DiskEncryptionSetsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.DiskEncryptionSet>
     {
         internal DiskEncryptionSetsUpdateOperation() { }
@@ -222,26 +222,6 @@ internal DiskEncryptionSetsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.DiskEncryptionSet>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.DiskEncryptionSet>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DisksClient
-    {
-        protected DisksClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Disk> Get(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Disk>> GetAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Disk> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Disk> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Disk> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Disk> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DisksCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DisksDeleteOperation StartDelete(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DisksGrantAccessOperation StartGrantAccess(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DisksRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.DisksUpdateOperation StartUpdate(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DisksCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.Disk>
     {
         internal DisksCreateOrUpdateOperation() { }
@@ -281,6 +261,26 @@ internal DisksGrantAccessOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.AccessUri>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.AccessUri>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DisksOperations
+    {
+        protected DisksOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Disk> Get(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Disk>> GetAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Disk> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Disk> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Disk> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Disk> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DisksCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DisksDeleteOperation StartDelete(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DisksGrantAccessOperation StartGrantAccess(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DisksRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.DisksUpdateOperation StartUpdate(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.DisksUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskName, Azure.ResourceManager.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DisksRevokeAccessOperation : Azure.Operation<Azure.Response>
     {
         internal DisksRevokeAccessOperation() { }
@@ -307,22 +307,6 @@ internal DisksUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Disk>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Disk>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleriesClient
-    {
-        protected GalleriesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Gallery> Get(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Gallery>> GetAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Gallery> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Gallery> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Gallery> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Gallery> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleriesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleriesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleriesDeleteOperation StartDelete(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleriesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleriesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleriesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleriesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.Gallery>
     {
         internal GalleriesCreateOrUpdateOperation() { }
@@ -349,6 +333,22 @@ internal GalleriesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleriesOperations
+    {
+        protected GalleriesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Gallery> Get(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Gallery>> GetAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Gallery> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Gallery> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Gallery> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Gallery> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleriesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleriesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleriesDeleteOperation StartDelete(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleriesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleriesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleriesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, Azure.ResourceManager.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleriesUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.Gallery>
     {
         internal GalleriesUpdateOperation() { }
@@ -362,20 +362,6 @@ internal GalleriesUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Gallery>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Gallery>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryApplicationsClient
-    {
-        protected GalleryApplicationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplication> Get(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplication>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryApplication> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryApplication> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryApplicationsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryApplication>
     {
         internal GalleryApplicationsCreateOrUpdateOperation() { }
@@ -402,6 +388,20 @@ internal GalleryApplicationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryApplicationsOperations
+    {
+        protected GalleryApplicationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplication> Get(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplication>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryApplication> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryApplication> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.ResourceManager.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryApplicationsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryApplication>
     {
         internal GalleryApplicationsUpdateOperation() { }
@@ -415,20 +415,6 @@ internal GalleryApplicationsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplication>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplication>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryApplicationVersionsClient
-    {
-        protected GalleryApplicationVersionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion> Get(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion> ListByGalleryApplication(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion> ListByGalleryApplicationAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryApplicationVersionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion>
     {
         internal GalleryApplicationVersionsCreateOrUpdateOperation() { }
@@ -455,6 +441,20 @@ internal GalleryApplicationVersionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryApplicationVersionsOperations
+    {
+        protected GalleryApplicationVersionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion> Get(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion> ListByGalleryApplication(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion> ListByGalleryApplicationAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryApplicationVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryApplicationVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.ResourceManager.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryApplicationVersionsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion>
     {
         internal GalleryApplicationVersionsUpdateOperation() { }
@@ -468,20 +468,6 @@ internal GalleryApplicationVersionsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryApplicationVersion>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryImagesClient
-    {
-        protected GalleryImagesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImage> Get(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImage>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryImage> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryImage> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImagesDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImagesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryImagesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryImage>
     {
         internal GalleryImagesCreateOrUpdateOperation() { }
@@ -508,6 +494,20 @@ internal GalleryImagesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryImagesOperations
+    {
+        protected GalleryImagesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImage> Get(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImage>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryImage> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryImage> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryImagesDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryImagesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.ResourceManager.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryImagesUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryImage>
     {
         internal GalleryImagesUpdateOperation() { }
@@ -521,20 +521,6 @@ internal GalleryImagesUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImage>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImage>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryImageVersionsClient
-    {
-        protected GalleryImageVersionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImageVersion> Get(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImageVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryImageVersion> ListByGalleryImage(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryImageVersion> ListByGalleryImageAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImageVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImageVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImageVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryImageVersionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryImageVersion>
     {
         internal GalleryImageVersionsCreateOrUpdateOperation() { }
@@ -561,6 +547,20 @@ internal GalleryImageVersionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryImageVersionsOperations
+    {
+        protected GalleryImageVersionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImageVersion> Get(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImageVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.GalleryImageVersion> ListByGalleryImage(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.GalleryImageVersion> ListByGalleryImageAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImageVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImageVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.GalleryImageVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.GalleryImageVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.ResourceManager.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryImageVersionsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.GalleryImageVersion>
     {
         internal GalleryImageVersionsUpdateOperation() { }
@@ -574,22 +574,6 @@ internal GalleryImageVersionsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImageVersion>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.GalleryImageVersion>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ImagesClient
-    {
-        protected ImagesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Image> Get(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Image>> GetAsync(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Image> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Image> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Image> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Image> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.ImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.ImagesDeleteOperation StartDelete(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.ImagesUpdateOperation StartUpdate(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ImagesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.Image>
     {
         internal ImagesCreateOrUpdateOperation() { }
@@ -616,6 +600,22 @@ internal ImagesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ImagesOperations
+    {
+        protected ImagesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Image> Get(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Image>> GetAsync(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Image> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Image> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Image> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Image> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.ImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.ImagesDeleteOperation StartDelete(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.ImagesUpdateOperation StartUpdate(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.ImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string imageName, Azure.ResourceManager.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ImagesUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.Image>
     {
         internal ImagesUpdateOperation() { }
@@ -629,14 +629,6 @@ internal ImagesUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Image>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Image>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LogAnalyticsClient
-    {
-        protected LogAnalyticsClient() { }
-        public virtual Azure.ResourceManager.Compute.LogAnalyticsExportRequestRateByIntervalOperation StartExportRequestRateByInterval(string location, Azure.ResourceManager.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.LogAnalyticsExportRequestRateByIntervalOperation> StartExportRequestRateByIntervalAsync(string location, Azure.ResourceManager.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.LogAnalyticsExportThrottledRequestsOperation StartExportThrottledRequests(string location, Azure.ResourceManager.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.LogAnalyticsExportThrottledRequestsOperation> StartExportThrottledRequestsAsync(string location, Azure.ResourceManager.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class LogAnalyticsExportRequestRateByIntervalOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.LogAnalyticsOperationResult>
     {
         internal LogAnalyticsExportRequestRateByIntervalOperation() { }
@@ -663,15 +655,23 @@ internal LogAnalyticsExportThrottledRequestsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.LogAnalyticsOperationResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.LogAnalyticsOperationResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class LogAnalyticsOperations
+    {
+        protected LogAnalyticsOperations() { }
+        public virtual Azure.ResourceManager.Compute.LogAnalyticsExportRequestRateByIntervalOperation StartExportRequestRateByInterval(string location, Azure.ResourceManager.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.LogAnalyticsExportRequestRateByIntervalOperation> StartExportRequestRateByIntervalAsync(string location, Azure.ResourceManager.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.LogAnalyticsExportThrottledRequestsOperation StartExportThrottledRequests(string location, Azure.ResourceManager.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.LogAnalyticsExportThrottledRequestsOperation> StartExportThrottledRequestsAsync(string location, Azure.ResourceManager.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.ComputeOperationValue> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.ComputeOperationValue> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ProximityPlacementGroupsClient
+    public partial class ProximityPlacementGroupsOperations
     {
-        protected ProximityPlacementGroupsClient() { }
+        protected ProximityPlacementGroupsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.ProximityPlacementGroup> CreateOrUpdate(string resourceGroupName, string proximityPlacementGroupName, Azure.ResourceManager.Compute.Models.ProximityPlacementGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.ProximityPlacementGroup>> CreateOrUpdateAsync(string resourceGroupName, string proximityPlacementGroupName, Azure.ResourceManager.Compute.Models.ProximityPlacementGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string proximityPlacementGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -685,32 +685,12 @@ protected ProximityPlacementGroupsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.ProximityPlacementGroup> Update(string resourceGroupName, string proximityPlacementGroupName, Azure.ResourceManager.Compute.Models.UpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.ProximityPlacementGroup>> UpdateAsync(string resourceGroupName, string proximityPlacementGroupName, Azure.ResourceManager.Compute.Models.UpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceSkusClient
+    public partial class ResourceSkusOperations
     {
-        protected ResourceSkusClient() { }
+        protected ResourceSkusOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.ResourceSku> List(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.ResourceSku> ListAsync(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SnapshotsClient
-    {
-        protected SnapshotsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Snapshot> Get(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Snapshot>> GetAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Snapshot> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Snapshot> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Snapshot> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Snapshot> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.SnapshotsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.SnapshotsDeleteOperation StartDelete(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsDeleteOperation> StartDeleteAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.SnapshotsGrantAccessOperation StartGrantAccess(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.SnapshotsRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.SnapshotsUpdateOperation StartUpdate(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsUpdateOperation> StartUpdateAsync(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class SnapshotsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.Snapshot>
     {
         internal SnapshotsCreateOrUpdateOperation() { }
@@ -750,6 +730,26 @@ internal SnapshotsGrantAccessOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.AccessUri>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.AccessUri>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class SnapshotsOperations
+    {
+        protected SnapshotsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.Snapshot> Get(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.Snapshot>> GetAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Snapshot> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Snapshot> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Snapshot> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Snapshot> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.SnapshotsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.SnapshotsDeleteOperation StartDelete(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsDeleteOperation> StartDeleteAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.SnapshotsGrantAccessOperation StartGrantAccess(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.SnapshotsRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.SnapshotsUpdateOperation StartUpdate(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.SnapshotsUpdateOperation> StartUpdateAsync(string resourceGroupName, string snapshotName, Azure.ResourceManager.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class SnapshotsRevokeAccessOperation : Azure.Operation<Azure.Response>
     {
         internal SnapshotsRevokeAccessOperation() { }
@@ -776,9 +776,9 @@ internal SnapshotsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Snapshot>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.Snapshot>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SshPublicKeysClient
+    public partial class SshPublicKeysOperations
     {
-        protected SshPublicKeysClient() { }
+        protected SshPublicKeysOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.SshPublicKeyResource> Create(string resourceGroupName, string sshPublicKeyName, Azure.ResourceManager.Compute.Models.SshPublicKeyResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.SshPublicKeyResource>> CreateAsync(string resourceGroupName, string sshPublicKeyName, Azure.ResourceManager.Compute.Models.SshPublicKeyResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string sshPublicKeyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -794,15 +794,15 @@ protected SshPublicKeysClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.SshPublicKeyResource> Update(string resourceGroupName, string sshPublicKeyName, Azure.ResourceManager.Compute.Models.SshPublicKeyUpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.SshPublicKeyResource>> UpdateAsync(string resourceGroupName, string sshPublicKeyName, Azure.ResourceManager.Compute.Models.SshPublicKeyUpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsageClient
+    public partial class UsageOperations
     {
-        protected UsageClient() { }
+        protected UsageOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.Usage> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.Usage> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineExtensionImagesClient
+    public partial class VirtualMachineExtensionImagesOperations
     {
-        protected VirtualMachineExtensionImagesClient() { }
+        protected VirtualMachineExtensionImagesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionImage> Get(string location, string publisherName, string type, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionImage>> GetAsync(string location, string publisherName, string type, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionImage>> ListTypes(string location, string publisherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -810,20 +810,6 @@ protected VirtualMachineExtensionImagesClient() { }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionImage>> ListVersions(string location, string publisherName, string type, string filter = null, int? top = default(int?), string orderby = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionImage>>> ListVersionsAsync(string location, string publisherName, string type, string filter = null, int? top = default(int?), string orderby = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineExtensionsClient
-    {
-        protected VirtualMachineExtensionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension> Get(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>
     {
         internal VirtualMachineExtensionsCreateOrUpdateOperation() { }
@@ -850,6 +836,20 @@ internal VirtualMachineExtensionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachineExtensionsOperations
+    {
+        protected VirtualMachineExtensionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension> Get(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachineExtensionsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>
     {
         internal VirtualMachineExtensionsUpdateOperation() { }
@@ -863,9 +863,9 @@ internal VirtualMachineExtensionsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineImagesClient
+    public partial class VirtualMachineImagesOperations
     {
-        protected VirtualMachineImagesClient() { }
+        protected VirtualMachineImagesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineImage> Get(string location, string publisherName, string offer, string skus, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineImage>> GetAsync(string location, string publisherName, string offer, string skus, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.VirtualMachineImageResource>> List(string location, string publisherName, string offer, string skus, string expand = null, int? top = default(int?), string orderby = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -877,28 +877,14 @@ protected VirtualMachineImagesClient() { }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.VirtualMachineImageResource>> ListSkus(string location, string publisherName, string offer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.ResourceManager.Compute.Models.VirtualMachineImageResource>>> ListSkusAsync(string location, string publisherName, string offer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineRunCommandsClient
+    public partial class VirtualMachineRunCommandsOperations
     {
-        protected VirtualMachineRunCommandsClient() { }
+        protected VirtualMachineRunCommandsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.RunCommandDocument> Get(string location, string commandId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.RunCommandDocument>> GetAsync(string location, string commandId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.RunCommandDocumentBase> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.RunCommandDocumentBase> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetExtensionsClient
-    {
-        protected VirtualMachineScaleSetExtensionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension> Get(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension> List(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension> ListAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineScaleSetExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension>
     {
         internal VirtualMachineScaleSetExtensionsCreateOrUpdateOperation() { }
@@ -925,6 +911,20 @@ internal VirtualMachineScaleSetExtensionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachineScaleSetExtensionsOperations
+    {
+        protected VirtualMachineScaleSetExtensionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension> Get(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension> List(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension> ListAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachineScaleSetExtensionsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetExtension>
     {
         internal VirtualMachineScaleSetExtensionsUpdateOperation() { }
@@ -951,9 +951,9 @@ internal VirtualMachineScaleSetRollingUpgradesCancelOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetRollingUpgradesClient
+    public partial class VirtualMachineScaleSetRollingUpgradesOperations
     {
-        protected VirtualMachineScaleSetRollingUpgradesClient() { }
+        protected VirtualMachineScaleSetRollingUpgradesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.RollingUpgradeStatusInfo> GetLatest(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.RollingUpgradeStatusInfo>> GetLatestAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetRollingUpgradesCancelOperation StartCancel(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -989,54 +989,6 @@ internal VirtualMachineScaleSetRollingUpgradesStartOSUpgradeOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetsClient
-    {
-        protected VirtualMachineScaleSetsClient() { }
-        public virtual Azure.Response ConvertToSinglePlacementGroup(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> ConvertToSinglePlacementGroupAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.RecoveryWalkResponse> ForceRecoveryServiceFabricPlatformUpdateDomainWalk(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.RecoveryWalkResponse>> ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> Get(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet>> GetAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistory(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistoryAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetSku> ListSkus(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetSku> ListSkusAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeallocateOperation StartDeallocate(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteInstancesOperation StartDeleteInstances(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteInstancesOperation> StartDeleteInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsPowerOffOperation StartPowerOff(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsRedeployOperation StartRedeploy(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageOperation StartReimage(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageAllOperation StartReimageAll(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageAllOperation> StartReimageAllAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageOperation> StartReimageAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsRestartOperation StartRestart(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsRestartOperation> StartRestartAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation StartSetOrchestrationServiceState(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation> StartSetOrchestrationServiceStateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsStartOperation StartStart(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsStartOperation> StartStartAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateInstancesOperation StartUpdateInstances(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateInstancesOperation> StartUpdateInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineScaleSetsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet>
     {
         internal VirtualMachineScaleSetsCreateOrUpdateOperation() { }
@@ -1089,6 +1041,54 @@ internal VirtualMachineScaleSetsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachineScaleSetsOperations
+    {
+        protected VirtualMachineScaleSetsOperations() { }
+        public virtual Azure.Response ConvertToSinglePlacementGroup(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> ConvertToSinglePlacementGroupAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.RecoveryWalkResponse> ForceRecoveryServiceFabricPlatformUpdateDomainWalk(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.RecoveryWalkResponse>> ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> Get(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet>> GetAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistory(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistoryAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetSku> ListSkus(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetSku> ListSkusAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeallocateOperation StartDeallocate(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteInstancesOperation StartDeleteInstances(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsDeleteInstancesOperation> StartDeleteInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsPowerOffOperation StartPowerOff(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsRedeployOperation StartRedeploy(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageOperation StartReimage(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageAllOperation StartReimageAll(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageAllOperation> StartReimageAllAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsReimageOperation> StartReimageAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsRestartOperation StartRestart(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsRestartOperation> StartRestartAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation StartSetOrchestrationServiceState(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation> StartSetOrchestrationServiceStateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsStartOperation StartStart(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsStartOperation> StartStartAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateInstancesOperation StartUpdateInstances(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetsUpdateInstancesOperation> StartUpdateInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachineScaleSetsPerformMaintenanceOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachineScaleSetsPerformMaintenanceOperation() { }
@@ -1219,9 +1219,35 @@ internal VirtualMachineScaleSetsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSet>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsClient
+    public partial class VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>
+    {
+        internal VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Compute.Models.VirtualMachineExtension Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualMachineScaleSetVMExtensionsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal VirtualMachineScaleSetVMExtensionsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualMachineScaleSetVMExtensionsOperations
     {
-        protected VirtualMachineScaleSetVMExtensionsClient() { }
+        protected VirtualMachineScaleSetVMExtensionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension> Get(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmScaleSetName, string instanceId, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1233,9 +1259,9 @@ protected VirtualMachineScaleSetVMExtensionsClient() { }
         public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetVMExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetVMExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, Azure.ResourceManager.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>
+    public partial class VirtualMachineScaleSetVMExtensionsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>
     {
-        internal VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation() { }
+        internal VirtualMachineScaleSetVMExtensionsUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1246,9 +1272,9 @@ internal VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualMachineScaleSetVMsDeallocateOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualMachineScaleSetVMExtensionsDeleteOperation() { }
+        internal VirtualMachineScaleSetVMsDeallocateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1259,22 +1285,22 @@ internal VirtualMachineScaleSetVMExtensionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsUpdateOperation : Azure.Operation<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>
+    public partial class VirtualMachineScaleSetVMsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualMachineScaleSetVMExtensionsUpdateOperation() { }
+        internal VirtualMachineScaleSetVMsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Compute.Models.VirtualMachineExtension Value { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMsClient
+    public partial class VirtualMachineScaleSetVMsOperations
     {
-        protected VirtualMachineScaleSetVMsClient() { }
+        protected VirtualMachineScaleSetVMsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVM> Get(string resourceGroupName, string vmScaleSetName, string instanceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVM>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVMInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, string instanceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1306,32 +1332,6 @@ protected VirtualMachineScaleSetVMsClient() { }
         public virtual Azure.ResourceManager.Compute.VirtualMachineScaleSetVMsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string instanceId, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVM parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachineScaleSetVMsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string instanceId, Azure.ResourceManager.Compute.Models.VirtualMachineScaleSetVM parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMsDeallocateOperation : Azure.Operation<Azure.Response>
-    {
-        internal VirtualMachineScaleSetVMsDeallocateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VirtualMachineScaleSetVMsDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal VirtualMachineScaleSetVMsDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineScaleSetVMsPerformMaintenanceOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachineScaleSetVMsPerformMaintenanceOperation() { }
@@ -1462,54 +1462,6 @@ internal VirtualMachinesCaptureOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineCaptureResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineCaptureResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachinesClient
-    {
-        protected VirtualMachinesClient() { }
-        public virtual Azure.Response Generalize(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> GeneralizeAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachine> Get(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachine>> GetAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineInstanceView> InstanceView(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineInstanceView>> InstanceViewAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachine> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListAll(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListAllAsync(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineSize> ListAvailableSizes(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineSize> ListAvailableSizesAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListByLocation(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListByLocationAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response SimulateEviction(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> SimulateEvictionAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesCaptureOperation StartCapture(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesCaptureOperation> StartCaptureAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesConvertToManagedDisksOperation StartConvertToManagedDisks(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesConvertToManagedDisksOperation> StartConvertToManagedDisksAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesDeallocateOperation StartDeallocate(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesDeleteOperation StartDelete(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesPowerOffOperation StartPowerOff(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesReapplyOperation StartReapply(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesReapplyOperation> StartReapplyAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesRedeployOperation StartRedeploy(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesReimageOperation StartReimage(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesReimageOperation> StartReimageAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesRestartOperation StartRestart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesRestartOperation> StartRestartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesRunCommandOperation StartRunCommand(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesRunCommandOperation> StartRunCommandAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesStartOperation StartStart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesStartOperation> StartStartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Compute.VirtualMachinesUpdateOperation StartUpdate(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachinesConvertToManagedDisksOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachinesConvertToManagedDisksOperation() { }
@@ -1562,12 +1514,60 @@ internal VirtualMachinesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineSizesClient
+    public partial class VirtualMachineSizesOperations
     {
-        protected VirtualMachineSizesClient() { }
+        protected VirtualMachineSizesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineSize> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineSize> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachinesOperations
+    {
+        protected VirtualMachinesOperations() { }
+        public virtual Azure.Response Generalize(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> GeneralizeAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachine> Get(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachine>> GetAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineInstanceView> InstanceView(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Compute.Models.VirtualMachineInstanceView>> InstanceViewAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachine> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListAll(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListAllAsync(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachineSize> ListAvailableSizes(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachineSize> ListAvailableSizesAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListByLocation(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Compute.Models.VirtualMachine> ListByLocationAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response SimulateEviction(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> SimulateEvictionAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesCaptureOperation StartCapture(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesCaptureOperation> StartCaptureAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesConvertToManagedDisksOperation StartConvertToManagedDisks(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesConvertToManagedDisksOperation> StartConvertToManagedDisksAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesDeallocateOperation StartDeallocate(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesDeleteOperation StartDelete(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesPowerOffOperation StartPowerOff(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesReapplyOperation StartReapply(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesReapplyOperation> StartReapplyAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesRedeployOperation StartRedeploy(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesReimageOperation StartReimage(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesReimageOperation> StartReimageAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesRestartOperation StartRestart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesRestartOperation> StartRestartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesRunCommandOperation StartRunCommand(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesRunCommandOperation> StartRunCommandAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesStartOperation StartStart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesStartOperation> StartStartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Compute.VirtualMachinesUpdateOperation StartUpdate(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Compute.VirtualMachinesUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, Azure.ResourceManager.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachinesPerformMaintenanceOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachinesPerformMaintenanceOperation() { }
diff --git a/sdk/eventhub/Azure.ResourceManager.EventHubs/api/Azure.ResourceManager.EventHubs.netstandard2.0.cs b/sdk/eventhub/Azure.ResourceManager.EventHubs/api/Azure.ResourceManager.EventHubs.netstandard2.0.cs
index 4831ed537b5ec..fb2808de87a0d 100644
--- a/sdk/eventhub/Azure.ResourceManager.EventHubs/api/Azure.ResourceManager.EventHubs.netstandard2.0.cs
+++ b/sdk/eventhub/Azure.ResourceManager.EventHubs/api/Azure.ResourceManager.EventHubs.netstandard2.0.cs
@@ -1,8 +1,21 @@
 namespace Azure.ResourceManager.EventHubs
 {
-    public partial class ClustersClient
+    public partial class ClustersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        protected ClustersClient() { }
+        internal ClustersDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ClustersOperations
+    {
+        protected ClustersOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.Cluster> Get(string resourceGroupName, string clusterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.Cluster>> GetAsync(string resourceGroupName, string clusterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.AvailableClustersList> ListAvailableClusters(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -18,19 +31,6 @@ protected ClustersClient() { }
         public virtual Azure.ResourceManager.EventHubs.ClustersPutOperation StartPut(string resourceGroupName, string clusterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.EventHubs.ClustersPutOperation> StartPutAsync(string resourceGroupName, string clusterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ClustersDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal ClustersDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ClustersPatchOperation : Azure.Operation<Azure.ResourceManager.EventHubs.Models.Cluster>
     {
         internal ClustersPatchOperation() { }
@@ -57,17 +57,17 @@ internal ClustersPutOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.EventHubs.Models.Cluster>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.EventHubs.Models.Cluster>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ConfigurationClient
+    public partial class ConfigurationOperations
     {
-        protected ConfigurationClient() { }
+        protected ConfigurationOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.ClusterQuotaConfigurationProperties> Get(string resourceGroupName, string clusterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.ClusterQuotaConfigurationProperties>> GetAsync(string resourceGroupName, string clusterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.ClusterQuotaConfigurationProperties> Patch(string resourceGroupName, string clusterName, Azure.ResourceManager.EventHubs.Models.ClusterQuotaConfigurationProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.ClusterQuotaConfigurationProperties>> PatchAsync(string resourceGroupName, string clusterName, Azure.ResourceManager.EventHubs.Models.ClusterQuotaConfigurationProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ConsumerGroupsClient
+    public partial class ConsumerGroupsOperations
     {
-        protected ConsumerGroupsClient() { }
+        protected ConsumerGroupsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.ConsumerGroup> CreateOrUpdate(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, Azure.ResourceManager.EventHubs.Models.ConsumerGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.ConsumerGroup>> CreateOrUpdateAsync(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, Azure.ResourceManager.EventHubs.Models.ConsumerGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string namespaceName, string eventHubName, string consumerGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -77,9 +77,9 @@ protected ConsumerGroupsClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.EventHubs.Models.ConsumerGroup> ListByEventHub(string resourceGroupName, string namespaceName, string eventHubName, int? skip = default(int?), int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.EventHubs.Models.ConsumerGroup> ListByEventHubAsync(string resourceGroupName, string namespaceName, string eventHubName, int? skip = default(int?), int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DisasterRecoveryConfigsClient
+    public partial class DisasterRecoveryConfigsOperations
     {
-        protected DisasterRecoveryConfigsClient() { }
+        protected DisasterRecoveryConfigsOperations() { }
         public virtual Azure.Response BreakPairing(string resourceGroupName, string namespaceName, string alias, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> BreakPairingAsync(string resourceGroupName, string namespaceName, string alias, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.CheckNameAvailabilityResult> CheckNameAvailability(string resourceGroupName, string namespaceName, Azure.ResourceManager.EventHubs.Models.CheckNameAvailabilityParameter parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -101,9 +101,27 @@ protected DisasterRecoveryConfigsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.AccessKeys> ListKeys(string resourceGroupName, string namespaceName, string alias, string authorizationRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.AccessKeys>> ListKeysAsync(string resourceGroupName, string namespaceName, string alias, string authorizationRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class EventHubsClient
+    public partial class EventHubsManagementClient
+    {
+        protected EventHubsManagementClient() { }
+        public EventHubsManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.EventHubs.EventHubsManagementClientOptions options = null) { }
+        public EventHubsManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.EventHubs.EventHubsManagementClientOptions options = null) { }
+        public virtual Azure.ResourceManager.EventHubs.ClustersOperations Clusters { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.ConfigurationOperations Configuration { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.ConsumerGroupsOperations ConsumerGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.DisasterRecoveryConfigsOperations DisasterRecoveryConfigs { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.EventHubsOperations EventHubs { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.NamespacesOperations Namespaces { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.EventHubs.RegionsOperations Regions { get { throw null; } }
+    }
+    public partial class EventHubsManagementClientOptions : Azure.Core.ClientOptions
+    {
+        public EventHubsManagementClientOptions() { }
+    }
+    public partial class EventHubsOperations
     {
-        protected EventHubsClient() { }
+        protected EventHubsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.Eventhub> CreateOrUpdate(string resourceGroupName, string namespaceName, string eventHubName, Azure.ResourceManager.EventHubs.Models.Eventhub parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.Eventhub>> CreateOrUpdateAsync(string resourceGroupName, string namespaceName, string eventHubName, Azure.ResourceManager.EventHubs.Models.Eventhub parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.AuthorizationRule> CreateOrUpdateAuthorizationRule(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, Azure.ResourceManager.EventHubs.Models.AuthorizationRule parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -125,27 +143,35 @@ protected EventHubsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.AccessKeys> RegenerateKeys(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, Azure.ResourceManager.EventHubs.Models.RegenerateAccessKeyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.AccessKeys>> RegenerateKeysAsync(string resourceGroupName, string namespaceName, string eventHubName, string authorizationRuleName, Azure.ResourceManager.EventHubs.Models.RegenerateAccessKeyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class EventHubsManagementClient
+    public partial class NamespacesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.EventHubs.Models.EHNamespace>
     {
-        protected EventHubsManagementClient() { }
-        public EventHubsManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.EventHubs.EventHubsManagementClientOptions options = null) { }
-        public EventHubsManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.EventHubs.EventHubsManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.EventHubs.ClustersClient GetClustersClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.ConfigurationClient GetConfigurationClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.ConsumerGroupsClient GetConsumerGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.DisasterRecoveryConfigsClient GetDisasterRecoveryConfigsClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.EventHubsClient GetEventHubsClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.NamespacesClient GetNamespacesClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.EventHubs.RegionsClient GetRegionsClient() { throw null; }
+        internal NamespacesCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.EventHubs.Models.EHNamespace Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.EventHubs.Models.EHNamespace>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.EventHubs.Models.EHNamespace>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class EventHubsManagementClientOptions : Azure.Core.ClientOptions
+    public partial class NamespacesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        public EventHubsManagementClientOptions() { }
+        internal NamespacesDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NamespacesClient
+    public partial class NamespacesOperations
     {
-        protected NamespacesClient() { }
+        protected NamespacesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.CheckNameAvailabilityResult> CheckNameAvailability(Azure.ResourceManager.EventHubs.Models.CheckNameAvailabilityParameter parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(Azure.ResourceManager.EventHubs.Models.CheckNameAvailabilityParameter parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.AuthorizationRule> CreateOrUpdateAuthorizationRule(string resourceGroupName, string namespaceName, string authorizationRuleName, Azure.ResourceManager.EventHubs.Models.AuthorizationRule parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -193,41 +219,15 @@ protected NamespacesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.EventHubs.Models.EHNamespace> Update(string resourceGroupName, string namespaceName, Azure.ResourceManager.EventHubs.Models.EHNamespace parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.EventHubs.Models.EHNamespace>> UpdateAsync(string resourceGroupName, string namespaceName, Azure.ResourceManager.EventHubs.Models.EHNamespace parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NamespacesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.EventHubs.Models.EHNamespace>
-    {
-        internal NamespacesCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.EventHubs.Models.EHNamespace Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.EventHubs.Models.EHNamespace>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.EventHubs.Models.EHNamespace>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NamespacesDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal NamespacesDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.EventHubs.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.EventHubs.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RegionsClient
+    public partial class RegionsOperations
     {
-        protected RegionsClient() { }
+        protected RegionsOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.EventHubs.Models.MessagingRegions> ListBySku(string sku, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.EventHubs.Models.MessagingRegions> ListBySkuAsync(string sku, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs
index 645287565ac02..ffe581826eb07 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/api/Azure.ResourceManager.KeyVault.netstandard2.0.cs
@@ -5,31 +5,21 @@ public partial class KeyVaultManagementClient
         protected KeyVaultManagementClient() { }
         public KeyVaultManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.KeyVault.KeyVaultManagementClientOptions options = null) { }
         public KeyVaultManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.KeyVault.KeyVaultManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.KeyVault.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.KeyVault.PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.KeyVault.PrivateLinkResourcesClient GetPrivateLinkResourcesClient() { throw null; }
-        public virtual Azure.ResourceManager.KeyVault.VaultsClient GetVaultsClient() { throw null; }
+        public virtual Azure.ResourceManager.KeyVault.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.KeyVault.PrivateEndpointConnectionsOperations PrivateEndpointConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.KeyVault.PrivateLinkResourcesOperations PrivateLinkResources { get { throw null; } }
+        public virtual Azure.ResourceManager.KeyVault.VaultsOperations Vaults { get { throw null; } }
     }
     public partial class KeyVaultManagementClientOptions : Azure.Core.ClientOptions
     {
         public KeyVaultManagementClientOptions() { }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.KeyVault.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.KeyVault.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointConnectionsClient
-    {
-        protected PrivateEndpointConnectionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection> Get(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>> GetAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection> Put(string resourceGroupName, string vaultName, string privateEndpointConnectionName, Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>> PutAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.KeyVault.PrivateEndpointConnectionsDeleteOperation StartDelete(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.KeyVault.PrivateEndpointConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class PrivateEndpointConnectionsDeleteOperation : Azure.Operation<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>
     {
         internal PrivateEndpointConnectionsDeleteOperation() { }
@@ -43,15 +33,38 @@ internal PrivateEndpointConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateEndpointConnectionsOperations
     {
-        protected PrivateLinkResourcesClient() { }
+        protected PrivateEndpointConnectionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection> Get(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>> GetAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection> Put(string resourceGroupName, string vaultName, string privateEndpointConnectionName, Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection>> PutAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, Azure.ResourceManager.KeyVault.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.KeyVault.PrivateEndpointConnectionsDeleteOperation StartDelete(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.KeyVault.PrivateEndpointConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vaultName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateLinkResourcesOperations
+    {
+        protected PrivateLinkResourcesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateLinkResourceListResult> ListByVault(string resourceGroupName, string vaultName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.PrivateLinkResourceListResult>> ListByVaultAsync(string resourceGroupName, string vaultName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VaultsClient
+    public partial class VaultsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.KeyVault.Models.Vault>
+    {
+        internal VaultsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.KeyVault.Models.Vault Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.KeyVault.Models.Vault>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.KeyVault.Models.Vault>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VaultsOperations
     {
-        protected VaultsClient() { }
+        protected VaultsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.KeyVault.Models.CheckNameAvailabilityResult> CheckNameAvailability(Azure.ResourceManager.KeyVault.Models.VaultCheckNameAvailabilityParameters vaultName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(Azure.ResourceManager.KeyVault.Models.VaultCheckNameAvailabilityParameters vaultName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string vaultName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -77,19 +90,6 @@ protected VaultsClient() { }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.VaultAccessPolicyParameters>> UpdateAccessPolicyAsync(string resourceGroupName, string vaultName, Azure.ResourceManager.KeyVault.Models.AccessPolicyUpdateKind operationKind, Azure.ResourceManager.KeyVault.Models.VaultAccessPolicyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.KeyVault.Models.Vault>> UpdateAsync(string resourceGroupName, string vaultName, Azure.ResourceManager.KeyVault.Models.VaultPatchParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VaultsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.KeyVault.Models.Vault>
-    {
-        internal VaultsCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.KeyVault.Models.Vault Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.KeyVault.Models.Vault>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.KeyVault.Models.Vault>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VaultsPurgeDeletedOperation : Azure.Operation<Azure.Response>
     {
         internal VaultsPurgeDeletedOperation() { }
diff --git a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs
index c7d1953b1a2f9..e2b3b9d4793fe 100644
--- a/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs
+++ b/sdk/keyvault/Azure.ResourceManager.KeyVault/tests/VaultOperationsTestsBase.cs
@@ -32,10 +32,10 @@ public abstract class VaultOperationsTestsBase : ManagementRecordedTestBase<KeyV
         public VaultProperties VaultProperties { get; internal set; }
 
 
-        public VaultsClient VaultsClient { get; set; }
-        public ResourcesClient ResourcesClient { get; set; }
-        public ResourceGroupsClient ResourceGroupsClient { get; set; }
-        public ProvidersClient ResourceProvidersClient { get; set; }
+        public VaultsOperations VaultsClient { get; set; }
+        public ResourcesOperations ResourcesClient { get; set; }
+        public ResourceGroupsOperations ResourceGroupsClient { get; set; }
+        public ProvidersOperations ResourceProvidersClient { get; set; }
 
         protected VaultOperationsTestsBase(bool isAsync)
             : base(isAsync)
@@ -45,12 +45,12 @@ protected VaultOperationsTestsBase(bool isAsync)
         protected async Task Initialize()
         {
             var resourceManagementClient = GetResourceManagementClient();
-            ResourcesClient = resourceManagementClient.GetResourcesClient();
-            ResourceGroupsClient = resourceManagementClient.GetResourceGroupsClient();
-            ResourceProvidersClient = resourceManagementClient.GetProvidersClient();
+            ResourcesClient = resourceManagementClient.Resources;
+            ResourceGroupsClient = resourceManagementClient.ResourceGroups;
+            ResourceProvidersClient = resourceManagementClient.Providers;
 
             var keyVaultManagementClient = GetKeyVaultManagementClient();
-            VaultsClient = keyVaultManagementClient.GetVaultsClient();
+            VaultsClient = keyVaultManagementClient.Vaults;
 
             if (Mode == RecordedTestMode.Playback)
             {
@@ -58,7 +58,7 @@ protected async Task Initialize()
             }
             else if (Mode == RecordedTestMode.Record)
             {
-                var spClient = new RbacManagementClient(TestEnvironment.TenantId, TestEnvironment.Credential).GetServicePrincipalsClient();
+                var spClient = new RbacManagementClient(TestEnvironment.TenantId, TestEnvironment.Credential).ServicePrincipals;
                 var servicePrincipalList = spClient.ListAsync($"appId eq '{TestEnvironment.ClientId}'");
                 await foreach (var servicePrincipal in servicePrincipalList)
                 {
diff --git a/sdk/network/Azure.ResourceManager.Network/api/Azure.ResourceManager.Network.netstandard2.0.cs b/sdk/network/Azure.ResourceManager.Network/api/Azure.ResourceManager.Network.netstandard2.0.cs
index e88bdd734a1ee..ac04f4da18f68 100644
--- a/sdk/network/Azure.ResourceManager.Network/api/Azure.ResourceManager.Network.netstandard2.0.cs
+++ b/sdk/network/Azure.ResourceManager.Network/api/Azure.ResourceManager.Network.netstandard2.0.cs
@@ -26,9 +26,35 @@ internal ApplicationGatewaysBackendHealthOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGatewayBackendHealth>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGatewayBackendHealth>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationGatewaysClient
+    public partial class ApplicationGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ApplicationGateway>
+    {
+        internal ApplicationGatewaysCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.ApplicationGateway Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ApplicationGatewaysDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal ApplicationGatewaysDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ApplicationGatewaysOperations
     {
-        protected ApplicationGatewaysClient() { }
+        protected ApplicationGatewaysOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway> Get(string resourceGroupName, string applicationGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway>> GetAsync(string resourceGroupName, string applicationGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGatewaySslPredefinedPolicy> GetSslPredefinedPolicy(string predefinedPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -64,32 +90,6 @@ protected ApplicationGatewaysClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway> UpdateTags(string resourceGroupName, string applicationGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway>> UpdateTagsAsync(string resourceGroupName, string applicationGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ApplicationGateway>
-    {
-        internal ApplicationGatewaysCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.ApplicationGateway Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class ApplicationGatewaysDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal ApplicationGatewaysDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ApplicationGatewaysStartOperation : Azure.Operation<Azure.Response>
     {
         internal ApplicationGatewaysStartOperation() { }
@@ -116,22 +116,6 @@ internal ApplicationGatewaysStopOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationSecurityGroupsClient
-    {
-        protected ApplicationSecurityGroupsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> Get(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup>> GetAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ApplicationSecurityGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ApplicationSecurityGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ApplicationSecurityGroupsDeleteOperation StartDelete(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ApplicationSecurityGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> UpdateTags(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ApplicationSecurityGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup>
     {
         internal ApplicationSecurityGroupsCreateOrUpdateOperation() { }
@@ -158,62 +142,62 @@ internal ApplicationSecurityGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableDelegationsClient
+    public partial class ApplicationSecurityGroupsOperations
+    {
+        protected ApplicationSecurityGroupsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> Get(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup>> GetAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ApplicationSecurityGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ApplicationSecurityGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ApplicationSecurityGroupsDeleteOperation StartDelete(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ApplicationSecurityGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup> UpdateTags(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ApplicationSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class AvailableDelegationsOperations
     {
-        protected AvailableDelegationsClient() { }
+        protected AvailableDelegationsOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AvailableDelegation> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AvailableDelegation> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableEndpointServicesClient
+    public partial class AvailableEndpointServicesOperations
     {
-        protected AvailableEndpointServicesClient() { }
+        protected AvailableEndpointServicesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.EndpointServiceResult> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.EndpointServiceResult> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailablePrivateEndpointTypesClient
+    public partial class AvailablePrivateEndpointTypesOperations
     {
-        protected AvailablePrivateEndpointTypesClient() { }
+        protected AvailablePrivateEndpointTypesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AvailablePrivateEndpointType> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AvailablePrivateEndpointType> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AvailablePrivateEndpointType> ListByResourceGroup(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AvailablePrivateEndpointType> ListByResourceGroupAsync(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableResourceGroupDelegationsClient
+    public partial class AvailableResourceGroupDelegationsOperations
     {
-        protected AvailableResourceGroupDelegationsClient() { }
+        protected AvailableResourceGroupDelegationsOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AvailableDelegation> List(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AvailableDelegation> ListAsync(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableServiceAliasesClient
+    public partial class AvailableServiceAliasesOperations
     {
-        protected AvailableServiceAliasesClient() { }
+        protected AvailableServiceAliasesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AvailableServiceAlias> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AvailableServiceAlias> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AvailableServiceAlias> ListByResourceGroup(string resourceGroupName, string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AvailableServiceAlias> ListByResourceGroupAsync(string resourceGroupName, string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AzureFirewallFqdnTagsClient
+    public partial class AzureFirewallFqdnTagsOperations
     {
-        protected AzureFirewallFqdnTagsClient() { }
+        protected AzureFirewallFqdnTagsOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AzureFirewallFqdnTag> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AzureFirewallFqdnTag> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AzureFirewallsClient
-    {
-        protected AzureFirewallsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.AzureFirewall> Get(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.AzureFirewall>> GetAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AzureFirewall> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AzureFirewall> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AzureFirewall> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AzureFirewall> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.AzureFirewallsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.AzureFirewallsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.AzureFirewallsDeleteOperation StartDelete(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.AzureFirewallsDeleteOperation> StartDeleteAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.AzureFirewallsUpdateTagsOperation StartUpdateTags(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.AzureFirewallsUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class AzureFirewallsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.AzureFirewall>
     {
         internal AzureFirewallsCreateOrUpdateOperation() { }
@@ -240,6 +224,22 @@ internal AzureFirewallsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class AzureFirewallsOperations
+    {
+        protected AzureFirewallsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.AzureFirewall> Get(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.AzureFirewall>> GetAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AzureFirewall> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.AzureFirewall> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AzureFirewall> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.AzureFirewall> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.AzureFirewallsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.AzureFirewallsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.AzureFirewallsDeleteOperation StartDelete(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.AzureFirewallsDeleteOperation> StartDeleteAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.AzureFirewallsUpdateTagsOperation StartUpdateTags(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.AzureFirewallsUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string azureFirewallName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class AzureFirewallsUpdateTagsOperation : Azure.Operation<Azure.ResourceManager.Network.Models.AzureFirewall>
     {
         internal AzureFirewallsUpdateTagsOperation() { }
@@ -253,20 +253,6 @@ internal AzureFirewallsUpdateTagsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.AzureFirewall>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.AzureFirewall>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class BastionHostsClient
-    {
-        protected BastionHostsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.BastionHost> Get(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.BastionHost>> GetAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionHost> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionHost> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionHost> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionHost> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.BastionHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.BastionHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.BastionHostsDeleteOperation StartDelete(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.BastionHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class BastionHostsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.BastionHost>
     {
         internal BastionHostsCreateOrUpdateOperation() { }
@@ -293,31 +279,25 @@ internal BastionHostsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class BgpServiceCommunitiesClient
+    public partial class BastionHostsOperations
     {
-        protected BgpServiceCommunitiesClient() { }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BgpServiceCommunity> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BgpServiceCommunity> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected BastionHostsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.BastionHost> Get(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.BastionHost>> GetAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionHost> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionHost> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionHost> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionHost> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.BastionHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.BastionHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.BastionHostsDeleteOperation StartDelete(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.BastionHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ConnectionMonitorsClient
+    public partial class BgpServiceCommunitiesOperations
     {
-        protected ConnectionMonitorsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> Get(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult>> GetAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ConnectionMonitorsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ConnectionMonitorsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ConnectionMonitorsQueryOperation StartQuery(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsQueryOperation> StartQueryAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ConnectionMonitorsStartOperation StartStart(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsStartOperation> StartStartAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ConnectionMonitorsStopOperation StartStop(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> UpdateTags(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected BgpServiceCommunitiesOperations() { }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BgpServiceCommunity> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BgpServiceCommunity> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ConnectionMonitorsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ConnectionMonitorResult>
     {
@@ -345,6 +325,26 @@ internal ConnectionMonitorsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ConnectionMonitorsOperations
+    {
+        protected ConnectionMonitorsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> Get(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult>> GetAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ConnectionMonitorsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ConnectionMonitorsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ConnectionMonitorsQueryOperation StartQuery(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsQueryOperation> StartQueryAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ConnectionMonitorsStartOperation StartStart(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsStartOperation> StartStartAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ConnectionMonitorsStopOperation StartStop(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ConnectionMonitorsStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult> UpdateTags(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ConnectionMonitorResult>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ConnectionMonitorsQueryOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ConnectionMonitorQueryResult>
     {
         internal ConnectionMonitorsQueryOperation() { }
@@ -384,18 +384,6 @@ internal ConnectionMonitorsStopOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DdosCustomPoliciesClient
-    {
-        protected DdosCustomPoliciesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy> Get(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy>> GetAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.DdosCustomPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosCustomPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.DdosCustomPoliciesDeleteOperation StartDelete(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosCustomPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy> UpdateTags(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy>> UpdateTagsAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DdosCustomPoliciesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.DdosCustomPolicy>
     {
         internal DdosCustomPoliciesCreateOrUpdateOperation() { }
@@ -422,21 +410,17 @@ internal DdosCustomPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DdosProtectionPlansClient
+    public partial class DdosCustomPoliciesOperations
     {
-        protected DdosProtectionPlansClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan> Get(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan>> GetAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.DdosProtectionPlansCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosProtectionPlansCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.DdosProtectionPlansDeleteOperation StartDelete(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosProtectionPlansDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan> UpdateTags(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan>> UpdateTagsAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected DdosCustomPoliciesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy> Get(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy>> GetAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.DdosCustomPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosCustomPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.DdosCustomPoliciesDeleteOperation StartDelete(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosCustomPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy> UpdateTags(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosCustomPolicy>> UpdateTagsAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class DdosProtectionPlansCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.DdosProtectionPlan>
     {
@@ -464,26 +448,30 @@ internal DdosProtectionPlansDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DefaultSecurityRulesClient
+    public partial class DdosProtectionPlansOperations
+    {
+        protected DdosProtectionPlansOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan> Get(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan>> GetAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.DdosProtectionPlan> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.DdosProtectionPlansCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosProtectionPlansCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.DdosProtectionPlansDeleteOperation StartDelete(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.DdosProtectionPlansDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan> UpdateTags(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DdosProtectionPlan>> UpdateTagsAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class DefaultSecurityRulesOperations
     {
-        protected DefaultSecurityRulesClient() { }
+        protected DefaultSecurityRulesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.SecurityRule> List(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.SecurityRule> ListAsync(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitAuthorizationsClient
-    {
-        protected ExpressRouteCircuitAuthorizationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization> Get(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization>> GetAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string authorizationName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string authorizationName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization>
     {
         internal ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation() { }
@@ -510,17 +498,17 @@ internal ExpressRouteCircuitAuthorizationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitConnectionsClient
+    public partial class ExpressRouteCircuitAuthorizationsOperations
     {
-        protected ExpressRouteCircuitConnectionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection> List(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection> ListAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitAuthorizationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization> Get(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization>> GetAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string authorizationName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string authorizationName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCircuitConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection>
     {
@@ -548,17 +536,17 @@ internal ExpressRouteCircuitConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitPeeringsClient
+    public partial class ExpressRouteCircuitConnectionsOperations
     {
-        protected ExpressRouteCircuitPeeringsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering> Get(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering>> GetAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitConnectionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection> List(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection> ListAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCircuitPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering>
     {
@@ -586,31 +574,17 @@ internal ExpressRouteCircuitPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitsClient
+    public partial class ExpressRouteCircuitPeeringsOperations
     {
-        protected ExpressRouteCircuitsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> Get(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit>> GetAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats> GetPeeringStats(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats>> GetPeeringStatsAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats> GetStats(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats>> GetStatsAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsDeleteOperation StartDelete(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsListArpTableOperation StartListArpTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> UpdateTags(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit>> UpdateTagsAsync(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitPeeringsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering> Get(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering>> GetAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCircuitsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteCircuit>
     {
@@ -677,17 +651,31 @@ internal ExpressRouteCircuitsListRoutesTableSummaryOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteConnectionsClient
+    public partial class ExpressRouteCircuitsOperations
     {
-        protected ExpressRouteConnectionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnection> Get(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnection>> GetAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnectionList> List(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnectionList>> ListAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteConnectionsDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> Get(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit>> GetAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats> GetPeeringStats(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats>> GetPeeringStatsAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats> GetStats(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuitStats>> GetStatsAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsDeleteOperation StartDelete(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsListArpTableOperation StartListArpTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit> UpdateTags(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCircuit>> UpdateTagsAsync(string resourceGroupName, string circuitName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteConnection>
     {
@@ -715,17 +703,17 @@ internal ExpressRouteConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCrossConnectionPeeringsClient
+    public partial class ExpressRouteConnectionsOperations
     {
-        protected ExpressRouteCrossConnectionPeeringsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering> Get(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering>> GetAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering> List(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering> ListAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation StartDelete(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteConnectionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnection> Get(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnection>> GetAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnectionList> List(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteConnectionList>> ListAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.ResourceManager.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteConnectionsDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering>
     {
@@ -753,25 +741,17 @@ internal ExpressRouteCrossConnectionPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCrossConnectionsClient
+    public partial class ExpressRouteCrossConnectionPeeringsOperations
     {
-        protected ExpressRouteCrossConnectionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> Get(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection>> GetAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListArpTableOperation StartListArpTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> UpdateTags(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection>> UpdateTagsAsync(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCrossConnectionPeeringsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering> Get(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering>> GetAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering> List(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering> ListAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, string peeringName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation StartDelete(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCrossConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection>
     {
@@ -825,19 +805,25 @@ internal ExpressRouteCrossConnectionsListRoutesTableSummaryOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnectionsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteGatewaysClient
+    public partial class ExpressRouteCrossConnectionsOperations
     {
-        protected ExpressRouteGatewaysClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGateway> Get(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGateway>> GetAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList>> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList> ListBySubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList>> ListBySubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, Azure.ResourceManager.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, Azure.ResourceManager.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteGatewaysDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCrossConnectionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> Get(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection>> GetAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListArpTableOperation StartListArpTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection> UpdateTags(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteCrossConnection>> UpdateTagsAsync(string resourceGroupName, string crossConnectionName, Azure.ResourceManager.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRouteGateway>
     {
@@ -865,30 +851,28 @@ internal ExpressRouteGatewaysDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteLinksClient
+    public partial class ExpressRouteGatewaysOperations
     {
-        protected ExpressRouteLinksClient() { }
+        protected ExpressRouteGatewaysOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGateway> Get(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGateway>> GetAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList>> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList> ListBySubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteGatewayList>> ListBySubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, Azure.ResourceManager.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, Azure.ResourceManager.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRouteGatewaysDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRouteGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ExpressRouteLinksOperations
+    {
+        protected ExpressRouteLinksOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteLink> Get(string resourceGroupName, string expressRoutePortName, string linkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRouteLink>> GetAsync(string resourceGroupName, string expressRoutePortName, string linkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteLink> List(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteLink> ListAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRoutePortsClient
-    {
-        protected ExpressRoutePortsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort> Get(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort>> GetAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRoutePortsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRoutePortsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRoutePortsDeleteOperation StartDelete(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRoutePortsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort> UpdateTags(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort>> UpdateTagsAsync(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ExpressRoutePortsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ExpressRoutePort>
     {
         internal ExpressRoutePortsCreateOrUpdateOperation() { }
@@ -915,33 +899,35 @@ internal ExpressRoutePortsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRoutePortsLocationsClient
+    public partial class ExpressRoutePortsLocationsOperations
     {
-        protected ExpressRoutePortsLocationsClient() { }
+        protected ExpressRoutePortsLocationsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePortsLocation> Get(string locationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePortsLocation>> GetAsync(string locationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRoutePortsLocation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRoutePortsLocation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteServiceProvidersClient
+    public partial class ExpressRoutePortsOperations
     {
-        protected ExpressRouteServiceProvidersClient() { }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteServiceProvider> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteServiceProvider> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRoutePortsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort> Get(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort>> GetAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRoutePort> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRoutePortsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRoutePortsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ExpressRoutePortsDeleteOperation StartDelete(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ExpressRoutePortsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort> UpdateTags(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ExpressRoutePort>> UpdateTagsAsync(string resourceGroupName, string expressRoutePortName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FirewallPoliciesClient
+    public partial class ExpressRouteServiceProvidersOperations
     {
-        protected FirewallPoliciesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicy> Get(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicy>> GetAsync(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.FirewallPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, Azure.ResourceManager.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, Azure.ResourceManager.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.FirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteServiceProvidersOperations() { }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ExpressRouteServiceProvider> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ExpressRouteServiceProvider> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class FirewallPoliciesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.FirewallPolicy>
     {
@@ -969,17 +955,19 @@ internal FirewallPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FirewallPolicyRuleGroupsClient
+    public partial class FirewallPoliciesOperations
     {
-        protected FirewallPolicyRuleGroupsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup> Get(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup>> GetAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup> List(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup> ListAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.FirewallPolicyRuleGroupsDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPolicyRuleGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected FirewallPoliciesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicy> Get(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicy>> GetAsync(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.FirewallPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, Azure.ResourceManager.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, Azure.ResourceManager.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.FirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class FirewallPolicyRuleGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup>
     {
@@ -1007,17 +995,17 @@ internal FirewallPolicyRuleGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FlowLogsClient
+    public partial class FirewallPolicyRuleGroupsOperations
     {
-        protected FlowLogsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.FlowLog> Get(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FlowLog>> GetAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FlowLog> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FlowLog> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.FlowLogsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.ResourceManager.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FlowLogsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.ResourceManager.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.FlowLogsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FlowLogsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected FirewallPolicyRuleGroupsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup> Get(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup>> GetAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup> List(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup> ListAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.ResourceManager.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.FirewallPolicyRuleGroupsDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FirewallPolicyRuleGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class FlowLogsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.FlowLog>
     {
@@ -1045,17 +1033,17 @@ internal FlowLogsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class HubRouteTablesClient
+    public partial class FlowLogsOperations
     {
-        protected HubRouteTablesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.HubRouteTable> Get(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.HubRouteTable>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.HubRouteTable> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.HubRouteTable> ListAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.HubRouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualHubName, string routeTableName, Azure.ResourceManager.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.HubRouteTablesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualHubName, string routeTableName, Azure.ResourceManager.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.HubRouteTablesDeleteOperation StartDelete(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.HubRouteTablesDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected FlowLogsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.FlowLog> Get(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FlowLog>> GetAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FlowLog> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FlowLog> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.FlowLogsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.ResourceManager.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FlowLogsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.ResourceManager.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.FlowLogsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.FlowLogsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class HubRouteTablesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.HubRouteTable>
     {
@@ -1083,26 +1071,26 @@ internal HubRouteTablesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class HubVirtualNetworkConnectionsClient
+    public partial class HubRouteTablesOperations
     {
-        protected HubVirtualNetworkConnectionsClient() { }
+        protected HubRouteTablesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.HubRouteTable> Get(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.HubRouteTable>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.HubRouteTable> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.HubRouteTable> ListAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.HubRouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualHubName, string routeTableName, Azure.ResourceManager.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.HubRouteTablesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualHubName, string routeTableName, Azure.ResourceManager.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.HubRouteTablesDeleteOperation StartDelete(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.HubRouteTablesDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class HubVirtualNetworkConnectionsOperations
+    {
+        protected HubVirtualNetworkConnectionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.HubVirtualNetworkConnection> Get(string resourceGroupName, string virtualHubName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.HubVirtualNetworkConnection>> GetAsync(string resourceGroupName, string virtualHubName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.HubVirtualNetworkConnection> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.HubVirtualNetworkConnection> ListAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class InboundNatRulesClient
-    {
-        protected InboundNatRulesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.InboundNatRule> Get(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.InboundNatRule>> GetAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.InboundNatRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.InboundNatRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.InboundNatRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.ResourceManager.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.InboundNatRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.ResourceManager.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.InboundNatRulesDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.InboundNatRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class InboundNatRulesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.InboundNatRule>
     {
         internal InboundNatRulesCreateOrUpdateOperation() { }
@@ -1129,21 +1117,17 @@ internal InboundNatRulesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class IpAllocationsClient
+    public partial class InboundNatRulesOperations
     {
-        protected IpAllocationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation> Get(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation>> GetAsync(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpAllocation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpAllocation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpAllocation> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpAllocation> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.IpAllocationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpAllocationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.IpAllocationsDeleteOperation StartDelete(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpAllocationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation> UpdateTags(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation>> UpdateTagsAsync(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected InboundNatRulesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.InboundNatRule> Get(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.InboundNatRule>> GetAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.InboundNatRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.InboundNatRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.InboundNatRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.ResourceManager.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.InboundNatRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.ResourceManager.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.InboundNatRulesDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.InboundNatRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class IpAllocationsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.IpAllocation>
     {
@@ -1171,21 +1155,21 @@ internal IpAllocationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class IpGroupsClient
+    public partial class IpAllocationsOperations
     {
-        protected IpGroupsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpGroup> Get(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpGroup>> GetAsync(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpGroup> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpGroup> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpGroup> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpGroup> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.IpGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.IpGroupsDeleteOperation StartDelete(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpGroup> UpdateGroups(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpGroup>> UpdateGroupsAsync(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected IpAllocationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation> Get(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation>> GetAsync(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpAllocation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpAllocation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpAllocation> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpAllocation> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.IpAllocationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpAllocationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.IpAllocationsDeleteOperation StartDelete(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpAllocationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation> UpdateTags(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpAllocation>> UpdateTagsAsync(string resourceGroupName, string ipAllocationName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class IpGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.IpGroup>
     {
@@ -1213,17 +1197,21 @@ internal IpGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerBackendAddressPoolsClient
+    public partial class IpGroupsOperations
     {
-        protected LoadBalancerBackendAddressPoolsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.BackendAddressPool> Get(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.BackendAddressPool>> GetAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BackendAddressPool> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BackendAddressPool> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.ResourceManager.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.ResourceManager.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected IpGroupsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpGroup> Get(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpGroup>> GetAsync(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpGroup> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpGroup> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.IpGroup> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.IpGroup> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.IpGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.IpGroupsDeleteOperation StartDelete(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.IpGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.IpGroup> UpdateGroups(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IpGroup>> UpdateGroupsAsync(string resourceGroupName, string ipGroupsName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class LoadBalancerBackendAddressPoolsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.BackendAddressPool>
     {
@@ -1251,60 +1239,56 @@ internal LoadBalancerBackendAddressPoolsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerFrontendIPConfigurationsClient
+    public partial class LoadBalancerBackendAddressPoolsOperations
+    {
+        protected LoadBalancerBackendAddressPoolsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.BackendAddressPool> Get(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.BackendAddressPool>> GetAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BackendAddressPool> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BackendAddressPool> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.ResourceManager.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.ResourceManager.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class LoadBalancerFrontendIPConfigurationsOperations
     {
-        protected LoadBalancerFrontendIPConfigurationsClient() { }
+        protected LoadBalancerFrontendIPConfigurationsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.FrontendIPConfiguration> Get(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.FrontendIPConfiguration>> GetAsync(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.FrontendIPConfiguration> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.FrontendIPConfiguration> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerLoadBalancingRulesClient
+    public partial class LoadBalancerLoadBalancingRulesOperations
     {
-        protected LoadBalancerLoadBalancingRulesClient() { }
+        protected LoadBalancerLoadBalancingRulesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancingRule> Get(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancingRule>> GetAsync(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancingRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancingRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerNetworkInterfacesClient
+    public partial class LoadBalancerNetworkInterfacesOperations
     {
-        protected LoadBalancerNetworkInterfacesClient() { }
+        protected LoadBalancerNetworkInterfacesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerOutboundRulesClient
+    public partial class LoadBalancerOutboundRulesOperations
     {
-        protected LoadBalancerOutboundRulesClient() { }
+        protected LoadBalancerOutboundRulesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.OutboundRule> Get(string resourceGroupName, string loadBalancerName, string outboundRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.OutboundRule>> GetAsync(string resourceGroupName, string loadBalancerName, string outboundRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.OutboundRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.OutboundRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerProbesClient
+    public partial class LoadBalancerProbesOperations
     {
-        protected LoadBalancerProbesClient() { }
+        protected LoadBalancerProbesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.Probe> Get(string resourceGroupName, string loadBalancerName, string probeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.Probe>> GetAsync(string resourceGroupName, string loadBalancerName, string probeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.Probe> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.Probe> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancersClient
-    {
-        protected LoadBalancersClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer> Get(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer>> GetAsync(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancer> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancersCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancersCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancersDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancersDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer> UpdateTags(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer>> UpdateTagsAsync(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class LoadBalancersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.LoadBalancer>
     {
         internal LoadBalancersCreateOrUpdateOperation() { }
@@ -1331,19 +1315,21 @@ internal LoadBalancersDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LocalNetworkGatewaysClient
+    public partial class LoadBalancersOperations
     {
-        protected LocalNetworkGatewaysClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway> Get(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway>> GetAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LocalNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LocalNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.LocalNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LocalNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.LocalNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LocalNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway> UpdateTags(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway>> UpdateTagsAsync(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected LoadBalancersOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer> Get(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer>> GetAsync(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancer> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.LoadBalancersCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancersCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.LoadBalancersDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LoadBalancersDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer> UpdateTags(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LoadBalancer>> UpdateTagsAsync(string resourceGroupName, string loadBalancerName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class LocalNetworkGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.LocalNetworkGateway>
     {
@@ -1371,21 +1357,19 @@ internal LocalNetworkGatewaysDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NatGatewaysClient
+    public partial class LocalNetworkGatewaysOperations
     {
-        protected NatGatewaysClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NatGateway> Get(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NatGateway>> GetAsync(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NatGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NatGateway> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NatGateway> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NatGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NatGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NatGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NatGatewaysDeleteOperation StartDelete(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NatGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NatGateway> UpdateTags(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NatGateway>> UpdateTagsAsync(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected LocalNetworkGatewaysOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway> Get(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway>> GetAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LocalNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LocalNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.LocalNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LocalNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.LocalNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.LocalNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway> UpdateTags(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.LocalNetworkGateway>> UpdateTagsAsync(string resourceGroupName, string localNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class NatGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NatGateway>
     {
@@ -1413,49 +1397,35 @@ internal NatGatewaysDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkInterfaceIPConfigurationsClient
+    public partial class NatGatewaysOperations
     {
-        protected NetworkInterfaceIPConfigurationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> Get(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NetworkInterfaceLoadBalancersClient
-    {
-        protected NetworkInterfaceLoadBalancersClient() { }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancer> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NetworkInterfacesClient
-    {
-        protected NetworkInterfacesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface> Get(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface>> GetAsync(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> GetVirtualMachineScaleSetIpConfiguration(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration>> GetVirtualMachineScaleSetIpConfigurationAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface> GetVirtualMachineScaleSetNetworkInterface(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface>> GetVirtualMachineScaleSetNetworkInterfaceAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurations(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurationsAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfacesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfacesDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfacesGetEffectiveRouteTableOperation StartGetEffectiveRouteTable(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesGetEffectiveRouteTableOperation> StartGetEffectiveRouteTableAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation StartListEffectiveNetworkSecurityGroups(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation> StartListEffectiveNetworkSecurityGroupsAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface> UpdateTags(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface>> UpdateTagsAsync(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected NatGatewaysOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NatGateway> Get(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NatGateway>> GetAsync(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NatGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NatGateway> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NatGateway> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NatGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NatGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NatGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NatGatewaysDeleteOperation StartDelete(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NatGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NatGateway> UpdateTags(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NatGateway>> UpdateTagsAsync(string resourceGroupName, string natGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkInterfaceIPConfigurationsOperations
+    {
+        protected NetworkInterfaceIPConfigurationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> Get(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkInterfaceLoadBalancersOperations
+    {
+        protected NetworkInterfaceLoadBalancersOperations() { }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.LoadBalancer> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class NetworkInterfacesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NetworkInterface>
     {
@@ -1509,17 +1479,35 @@ internal NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.EffectiveNetworkSecurityGroupListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.EffectiveNetworkSecurityGroupListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkInterfaceTapConfigurationsClient
+    public partial class NetworkInterfacesOperations
     {
-        protected NetworkInterfaceTapConfigurationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration> Get(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected NetworkInterfacesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface> Get(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface>> GetAsync(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> GetVirtualMachineScaleSetIpConfiguration(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration>> GetVirtualMachineScaleSetIpConfigurationAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface> GetVirtualMachineScaleSetNetworkInterface(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface>> GetVirtualMachineScaleSetNetworkInterfaceAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurations(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurationsAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkInterfacesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkInterfacesDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkInterfacesGetEffectiveRouteTableOperation StartGetEffectiveRouteTable(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesGetEffectiveRouteTableOperation> StartGetEffectiveRouteTableAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation StartListEffectiveNetworkSecurityGroups(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation> StartListEffectiveNetworkSecurityGroupsAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface> UpdateTags(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterface>> UpdateTagsAsync(string resourceGroupName, string networkInterfaceName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class NetworkInterfaceTapConfigurationsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration>
     {
@@ -1547,114 +1535,139 @@ internal NetworkInterfaceTapConfigurationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class NetworkInterfaceTapConfigurationsOperations
+    {
+        protected NetworkInterfaceTapConfigurationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration> Get(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.ResourceManager.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class NetworkManagementClient
     {
         protected NetworkManagementClient() { }
         public NetworkManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Network.NetworkManagementClientOptions options = null) { }
         public NetworkManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Network.NetworkManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.Network.ApplicationGatewaysClient GetApplicationGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ApplicationSecurityGroupsClient GetApplicationSecurityGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AvailableDelegationsClient GetAvailableDelegationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AvailableEndpointServicesClient GetAvailableEndpointServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AvailablePrivateEndpointTypesClient GetAvailablePrivateEndpointTypesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AvailableResourceGroupDelegationsClient GetAvailableResourceGroupDelegationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AvailableServiceAliasesClient GetAvailableServiceAliasesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AzureFirewallFqdnTagsClient GetAzureFirewallFqdnTagsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.AzureFirewallsClient GetAzureFirewallsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.BastionHostsClient GetBastionHostsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.BgpServiceCommunitiesClient GetBgpServiceCommunitiesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ConnectionMonitorsClient GetConnectionMonitorsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.DdosCustomPoliciesClient GetDdosCustomPoliciesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.DdosProtectionPlansClient GetDdosProtectionPlansClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.DefaultSecurityRulesClient GetDefaultSecurityRulesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsClient GetExpressRouteCircuitAuthorizationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsClient GetExpressRouteCircuitConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsClient GetExpressRouteCircuitPeeringsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsClient GetExpressRouteCircuitsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteConnectionsClient GetExpressRouteConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsClient GetExpressRouteCrossConnectionPeeringsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsClient GetExpressRouteCrossConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteGatewaysClient GetExpressRouteGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteLinksClient GetExpressRouteLinksClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRoutePortsClient GetExpressRoutePortsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRoutePortsLocationsClient GetExpressRoutePortsLocationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ExpressRouteServiceProvidersClient GetExpressRouteServiceProvidersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.FirewallPoliciesClient GetFirewallPoliciesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.FirewallPolicyRuleGroupsClient GetFirewallPolicyRuleGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.FlowLogsClient GetFlowLogsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.HubRouteTablesClient GetHubRouteTablesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.HubVirtualNetworkConnectionsClient GetHubVirtualNetworkConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.InboundNatRulesClient GetInboundNatRulesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.IpAllocationsClient GetIpAllocationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.IpGroupsClient GetIpGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsClient GetLoadBalancerBackendAddressPoolsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerFrontendIPConfigurationsClient GetLoadBalancerFrontendIPConfigurationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerLoadBalancingRulesClient GetLoadBalancerLoadBalancingRulesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerNetworkInterfacesClient GetLoadBalancerNetworkInterfacesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerOutboundRulesClient GetLoadBalancerOutboundRulesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancerProbesClient GetLoadBalancerProbesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LoadBalancersClient GetLoadBalancersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.LocalNetworkGatewaysClient GetLocalNetworkGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NatGatewaysClient GetNatGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfaceIPConfigurationsClient GetNetworkInterfaceIPConfigurationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfaceLoadBalancersClient GetNetworkInterfaceLoadBalancersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfacesClient GetNetworkInterfacesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsClient GetNetworkInterfaceTapConfigurationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkProfilesClient GetNetworkProfilesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkSecurityGroupsClient GetNetworkSecurityGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkVirtualAppliancesClient GetNetworkVirtualAppliancesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersClient GetNetworkWatchersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysClient GetP2SVpnGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PacketCapturesClient GetPacketCapturesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PeerExpressRouteCircuitConnectionsClient GetPeerExpressRouteCircuitConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PrivateDnsZoneGroupsClient GetPrivateDnsZoneGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PrivateEndpointsClient GetPrivateEndpointsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PrivateLinkServicesClient GetPrivateLinkServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PublicIPAddressesClient GetPublicIPAddressesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.PublicIPPrefixesClient GetPublicIPPrefixesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ResourceNavigationLinksClient GetResourceNavigationLinksClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.RouteFilterRulesClient GetRouteFilterRulesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.RouteFiltersClient GetRouteFiltersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.RoutesClient GetRoutesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.RouteTablesClient GetRouteTablesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.SecurityPartnerProvidersClient GetSecurityPartnerProvidersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.SecurityRulesClient GetSecurityRulesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceAssociationLinksClient GetServiceAssociationLinksClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceClient GetServiceClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceEndpointPoliciesClient GetServiceEndpointPoliciesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsClient GetServiceEndpointPolicyDefinitionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceTagsClient GetServiceTagsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.SubnetsClient GetSubnetsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.UsagesClient GetUsagesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualHubRouteTableV2SClient GetVirtualHubRouteTableV2SClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualHubsClient GetVirtualHubsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewayConnectionsClient GetVirtualNetworkGatewayConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysClient GetVirtualNetworkGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkPeeringsClient GetVirtualNetworkPeeringsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworksClient GetVirtualNetworksClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkTapsClient GetVirtualNetworkTapsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualRouterPeeringsClient GetVirtualRouterPeeringsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualRoutersClient GetVirtualRoutersClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualWansClient GetVirtualWansClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnConnectionsClient GetVpnConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnGatewaysClient GetVpnGatewaysClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnLinkConnectionsClient GetVpnLinkConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsAssociatedWithVirtualWanClient GetVpnServerConfigurationsAssociatedWithVirtualWanClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsClient GetVpnServerConfigurationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnSiteLinkConnectionsClient GetVpnSiteLinkConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnSiteLinksClient GetVpnSiteLinksClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnSitesClient GetVpnSitesClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnSitesConfigurationClient GetVpnSitesConfigurationClient() { throw null; }
-        public virtual Azure.ResourceManager.Network.WebApplicationFirewallPoliciesClient GetWebApplicationFirewallPoliciesClient() { throw null; }
+        public virtual Azure.ResourceManager.Network.ApplicationGatewaysOperations ApplicationGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ApplicationSecurityGroupsOperations ApplicationSecurityGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AvailableDelegationsOperations AvailableDelegations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AvailableEndpointServicesOperations AvailableEndpointServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AvailablePrivateEndpointTypesOperations AvailablePrivateEndpointTypes { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AvailableResourceGroupDelegationsOperations AvailableResourceGroupDelegations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AvailableServiceAliasesOperations AvailableServiceAliases { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AzureFirewallFqdnTagsOperations AzureFirewallFqdnTags { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.AzureFirewallsOperations AzureFirewalls { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.BastionHostsOperations BastionHosts { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.BgpServiceCommunitiesOperations BgpServiceCommunities { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ConnectionMonitorsOperations ConnectionMonitors { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.DdosCustomPoliciesOperations DdosCustomPolicies { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.DdosProtectionPlansOperations DdosProtectionPlans { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.DefaultSecurityRulesOperations DefaultSecurityRules { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitAuthorizationsOperations ExpressRouteCircuitAuthorizations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitConnectionsOperations ExpressRouteCircuitConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitPeeringsOperations ExpressRouteCircuitPeerings { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCircuitsOperations ExpressRouteCircuits { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteConnectionsOperations ExpressRouteConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionPeeringsOperations ExpressRouteCrossConnectionPeerings { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteCrossConnectionsOperations ExpressRouteCrossConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteGatewaysOperations ExpressRouteGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteLinksOperations ExpressRouteLinks { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRoutePortsOperations ExpressRoutePorts { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRoutePortsLocationsOperations ExpressRoutePortsLocations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ExpressRouteServiceProvidersOperations ExpressRouteServiceProviders { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.FirewallPoliciesOperations FirewallPolicies { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.FirewallPolicyRuleGroupsOperations FirewallPolicyRuleGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.FlowLogsOperations FlowLogs { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.HubRouteTablesOperations HubRouteTables { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.HubVirtualNetworkConnectionsOperations HubVirtualNetworkConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.InboundNatRulesOperations InboundNatRules { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.IpAllocationsOperations IpAllocations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.IpGroupsOperations IpGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancerBackendAddressPoolsOperations LoadBalancerBackendAddressPools { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancerFrontendIPConfigurationsOperations LoadBalancerFrontendIPConfigurations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancerLoadBalancingRulesOperations LoadBalancerLoadBalancingRules { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancerNetworkInterfacesOperations LoadBalancerNetworkInterfaces { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancerOutboundRulesOperations LoadBalancerOutboundRules { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancerProbesOperations LoadBalancerProbes { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LoadBalancersOperations LoadBalancers { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.LocalNetworkGatewaysOperations LocalNetworkGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NatGatewaysOperations NatGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkInterfaceIPConfigurationsOperations NetworkInterfaceIPConfigurations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkInterfaceLoadBalancersOperations NetworkInterfaceLoadBalancers { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkInterfacesOperations NetworkInterfaces { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkInterfaceTapConfigurationsOperations NetworkInterfaceTapConfigurations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkProfilesOperations NetworkProfiles { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkSecurityGroupsOperations NetworkSecurityGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkVirtualAppliancesOperations NetworkVirtualAppliances { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersOperations NetworkWatchers { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysOperations P2SVpnGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PacketCapturesOperations PacketCaptures { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PeerExpressRouteCircuitConnectionsOperations PeerExpressRouteCircuitConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PrivateDnsZoneGroupsOperations PrivateDnsZoneGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PrivateEndpointsOperations PrivateEndpoints { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PrivateLinkServicesOperations PrivateLinkServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PublicIPAddressesOperations PublicIPAddresses { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.PublicIPPrefixesOperations PublicIPPrefixes { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ResourceNavigationLinksOperations ResourceNavigationLinks { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.RouteFilterRulesOperations RouteFilterRules { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.RouteFiltersOperations RouteFilters { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.RoutesOperations Routes { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.RouteTablesOperations RouteTables { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.SecurityPartnerProvidersOperations SecurityPartnerProviders { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.SecurityRulesOperations SecurityRules { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ServiceOperations Service { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ServiceAssociationLinksOperations ServiceAssociationLinks { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ServiceEndpointPoliciesOperations ServiceEndpointPolicies { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsOperations ServiceEndpointPolicyDefinitions { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.ServiceTagsOperations ServiceTags { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.SubnetsOperations Subnets { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.UsagesOperations Usages { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualHubRouteTableV2SOperations VirtualHubRouteTableV2S { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualHubsOperations VirtualHubs { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewayConnectionsOperations VirtualNetworkGatewayConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysOperations VirtualNetworkGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkPeeringsOperations VirtualNetworkPeerings { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualNetworksOperations VirtualNetworks { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkTapsOperations VirtualNetworkTaps { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualRouterPeeringsOperations VirtualRouterPeerings { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualRoutersOperations VirtualRouters { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VirtualWansOperations VirtualWans { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnConnectionsOperations VpnConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnGatewaysOperations VpnGateways { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnLinkConnectionsOperations VpnLinkConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsOperations VpnServerConfigurations { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsAssociatedWithVirtualWanOperations VpnServerConfigurationsAssociatedWithVirtualWan { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnSiteLinkConnectionsOperations VpnSiteLinkConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnSiteLinksOperations VpnSiteLinks { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnSitesOperations VpnSites { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.VpnSitesConfigurationOperations VpnSitesConfiguration { get { throw null; } }
+        public virtual Azure.ResourceManager.Network.WebApplicationFirewallPoliciesOperations WebApplicationFirewallPolicies { get { throw null; } }
     }
     public partial class NetworkManagementClientOptions : Azure.Core.ClientOptions
     {
         public NetworkManagementClientOptions() { }
     }
-    public partial class NetworkProfilesClient
+    public partial class NetworkProfilesDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal NetworkProfilesDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkProfilesOperations
     {
-        protected NetworkProfilesClient() { }
+        protected NetworkProfilesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkProfile> CreateOrUpdate(string resourceGroupName, string networkProfileName, Azure.ResourceManager.Network.Models.NetworkProfile parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkProfile>> CreateOrUpdateAsync(string resourceGroupName, string networkProfileName, Azure.ResourceManager.Network.Models.NetworkProfile parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkProfile> Get(string resourceGroupName, string networkProfileName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1668,9 +1681,22 @@ protected NetworkProfilesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkProfile> UpdateTags(string resourceGroupName, string networkProfileName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkProfile>> UpdateTagsAsync(string resourceGroupName, string networkProfileName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkProfilesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class NetworkSecurityGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>
     {
-        internal NetworkProfilesDeleteOperation() { }
+        internal NetworkSecurityGroupsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.NetworkSecurityGroup Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkSecurityGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal NetworkSecurityGroupsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1681,9 +1707,9 @@ internal NetworkProfilesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkSecurityGroupsClient
+    public partial class NetworkSecurityGroupsOperations
     {
-        protected NetworkSecurityGroupsClient() { }
+        protected NetworkSecurityGroupsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup> Get(string resourceGroupName, string networkSecurityGroupName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkSecurityGroup> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1697,22 +1723,22 @@ protected NetworkSecurityGroupsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup> UpdateTags(string resourceGroupName, string networkSecurityGroupName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string networkSecurityGroupName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkSecurityGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>
+    public partial class NetworkVirtualAppliancesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>
     {
-        internal NetworkSecurityGroupsCreateOrUpdateOperation() { }
+        internal NetworkVirtualAppliancesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.NetworkSecurityGroup Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.NetworkVirtualAppliance Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkSecurityGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class NetworkVirtualAppliancesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal NetworkSecurityGroupsDeleteOperation() { }
+        internal NetworkVirtualAppliancesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1723,9 +1749,9 @@ internal NetworkSecurityGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkVirtualAppliancesClient
+    public partial class NetworkVirtualAppliancesOperations
     {
-        protected NetworkVirtualAppliancesClient() { }
+        protected NetworkVirtualAppliancesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance> Get(string resourceGroupName, string networkVirtualApplianceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>> GetAsync(string resourceGroupName, string networkVirtualApplianceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1739,32 +1765,6 @@ protected NetworkVirtualAppliancesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance> UpdateTags(string resourceGroupName, string networkVirtualApplianceName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>> UpdateTagsAsync(string resourceGroupName, string networkVirtualApplianceName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkVirtualAppliancesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>
-    {
-        internal NetworkVirtualAppliancesCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.NetworkVirtualAppliance Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NetworkVirtualAppliancesDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal NetworkVirtualAppliancesDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class NetworkWatchersCheckConnectivityOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ConnectivityInformation>
     {
         internal NetworkWatchersCheckConnectivityOperation() { }
@@ -1778,46 +1778,6 @@ internal NetworkWatchersCheckConnectivityOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ConnectivityInformation>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.ConnectivityInformation>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkWatchersClient
-    {
-        protected NetworkWatchersClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher> CreateOrUpdate(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher>> CreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher> Get(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher>> GetAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.Topology> GetTopology(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.Topology>> GetTopologyAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkWatcher> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkWatcher> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkWatcher> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkWatcher> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersCheckConnectivityOperation StartCheckConnectivity(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersCheckConnectivityOperation> StartCheckConnectivityAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetAzureReachabilityReportOperation StartGetAzureReachabilityReport(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetAzureReachabilityReportOperation> StartGetAzureReachabilityReportAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetFlowLogStatusOperation StartGetFlowLogStatus(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetFlowLogStatusOperation> StartGetFlowLogStatusAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation StartGetNetworkConfigurationDiagnostic(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation> StartGetNetworkConfigurationDiagnosticAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetNextHopOperation StartGetNextHop(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetNextHopOperation> StartGetNextHopAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingOperation StartGetTroubleshooting(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingOperation> StartGetTroubleshootingAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingResultOperation StartGetTroubleshootingResult(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingResultOperation> StartGetTroubleshootingResultAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersGetVMSecurityRulesOperation StartGetVMSecurityRules(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetVMSecurityRulesOperation> StartGetVMSecurityRulesAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersListAvailableProvidersOperation StartListAvailableProviders(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersListAvailableProvidersOperation> StartListAvailableProvidersAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersSetFlowLogConfigurationOperation StartSetFlowLogConfiguration(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersSetFlowLogConfigurationOperation> StartSetFlowLogConfigurationAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.NetworkWatchersVerifyIPFlowOperation StartVerifyIPFlow(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersVerifyIPFlowOperation> StartVerifyIPFlowAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher> UpdateTags(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class NetworkWatchersDeleteOperation : Azure.Operation<Azure.Response>
     {
         internal NetworkWatchersDeleteOperation() { }
@@ -1935,6 +1895,46 @@ internal NetworkWatchersListAvailableProvidersOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.AvailableProvidersList>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.AvailableProvidersList>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class NetworkWatchersOperations
+    {
+        protected NetworkWatchersOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher> CreateOrUpdate(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher>> CreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher> Get(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher>> GetAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.Topology> GetTopology(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.Topology>> GetTopologyAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkWatcher> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.NetworkWatcher> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkWatcher> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.NetworkWatcher> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersCheckConnectivityOperation StartCheckConnectivity(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersCheckConnectivityOperation> StartCheckConnectivityAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetAzureReachabilityReportOperation StartGetAzureReachabilityReport(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetAzureReachabilityReportOperation> StartGetAzureReachabilityReportAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetFlowLogStatusOperation StartGetFlowLogStatus(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetFlowLogStatusOperation> StartGetFlowLogStatusAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation StartGetNetworkConfigurationDiagnostic(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation> StartGetNetworkConfigurationDiagnosticAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetNextHopOperation StartGetNextHop(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetNextHopOperation> StartGetNextHopAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingOperation StartGetTroubleshooting(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingOperation> StartGetTroubleshootingAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingResultOperation StartGetTroubleshootingResult(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetTroubleshootingResultOperation> StartGetTroubleshootingResultAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersGetVMSecurityRulesOperation StartGetVMSecurityRules(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersGetVMSecurityRulesOperation> StartGetVMSecurityRulesAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersListAvailableProvidersOperation StartListAvailableProviders(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersListAvailableProvidersOperation> StartListAvailableProvidersAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersSetFlowLogConfigurationOperation StartSetFlowLogConfiguration(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersSetFlowLogConfigurationOperation> StartSetFlowLogConfigurationAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.NetworkWatchersVerifyIPFlowOperation StartVerifyIPFlow(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.NetworkWatchersVerifyIPFlowOperation> StartVerifyIPFlowAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher> UpdateTags(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.NetworkWatcher>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class NetworkWatchersSetFlowLogConfigurationOperation : Azure.Operation<Azure.ResourceManager.Network.Models.FlowLogInformation>
     {
         internal NetworkWatchersSetFlowLogConfigurationOperation() { }
@@ -1961,36 +1961,12 @@ internal NetworkWatchersVerifyIPFlowOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VerificationIPFlowResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VerificationIPFlowResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class P2SVpnGatewaysClient
-    {
-        protected P2SVpnGatewaysClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway> Get(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway>> GetAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysDeleteOperation StartDelete(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation StartDisconnectP2SVpnConnections(string resourceGroupName, string p2SVpnGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation> StartDisconnectP2SVpnConnectionsAsync(string resourceGroupName, string p2SVpnGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation StartGetP2SVpnConnectionHealth(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation> StartGetP2SVpnConnectionHealthAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation StartGetP2SVpnConnectionHealthDetailed(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation> StartGetP2SVpnConnectionHealthDetailedAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway> UpdateTags(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class P2SVpnGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.P2SVpnGateway>
     {
         internal P2SVpnGatewaysCreateOrUpdateOperation() { }
@@ -2069,21 +2045,29 @@ internal P2SVpnGatewaysGetP2SVpnConnectionHealthOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PacketCapturesClient
+    public partial class P2SVpnGatewaysOperations
     {
-        protected PacketCapturesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.PacketCaptureResult> Get(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PacketCaptureResult>> GetAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.PacketCaptureResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.PacketCaptureResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.PacketCapturesCreateOperation StartCreate(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.ResourceManager.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesCreateOperation> StartCreateAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.ResourceManager.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.PacketCapturesDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.PacketCapturesGetStatusOperation StartGetStatus(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesGetStatusOperation> StartGetStatusAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.PacketCapturesStopOperation StartStop(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected P2SVpnGatewaysOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway> Get(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway>> GetAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.P2SVpnGateway> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysDeleteOperation StartDelete(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation StartDisconnectP2SVpnConnections(string resourceGroupName, string p2SVpnGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation> StartDisconnectP2SVpnConnectionsAsync(string resourceGroupName, string p2SVpnGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation StartGetP2SVpnConnectionHealth(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation> StartGetP2SVpnConnectionHealthAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation StartGetP2SVpnConnectionHealthDetailed(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation> StartGetP2SVpnConnectionHealthDetailedAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway> UpdateTags(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.P2SVpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class PacketCapturesCreateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PacketCaptureResult>
     {
@@ -2124,6 +2108,22 @@ internal PacketCapturesGetStatusOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PacketCaptureQueryStatusResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PacketCaptureQueryStatusResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class PacketCapturesOperations
+    {
+        protected PacketCapturesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.PacketCaptureResult> Get(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PacketCaptureResult>> GetAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.PacketCaptureResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.PacketCaptureResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.PacketCapturesCreateOperation StartCreate(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.ResourceManager.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesCreateOperation> StartCreateAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.ResourceManager.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.PacketCapturesDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.PacketCapturesGetStatusOperation StartGetStatus(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesGetStatusOperation> StartGetStatusAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.PacketCapturesStopOperation StartStop(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PacketCapturesStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class PacketCapturesStopOperation : Azure.Operation<Azure.Response>
     {
         internal PacketCapturesStopOperation() { }
@@ -2137,17 +2137,43 @@ internal PacketCapturesStopOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PeerExpressRouteCircuitConnectionsClient
+    public partial class PeerExpressRouteCircuitConnectionsOperations
     {
-        protected PeerExpressRouteCircuitConnectionsClient() { }
+        protected PeerExpressRouteCircuitConnectionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PeerExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PeerExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.PeerExpressRouteCircuitConnection> List(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.PeerExpressRouteCircuitConnection> ListAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateDnsZoneGroupsClient
+    public partial class PrivateDnsZoneGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>
+    {
+        internal PrivateDnsZoneGroupsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateDnsZoneGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal PrivateDnsZoneGroupsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateDnsZoneGroupsOperations
     {
-        protected PrivateDnsZoneGroupsClient() { }
+        protected PrivateDnsZoneGroupsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup> Get(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>> GetAsync(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup> List(string privateEndpointName, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2157,22 +2183,22 @@ protected PrivateDnsZoneGroupsClient() { }
         public virtual Azure.ResourceManager.Network.PrivateDnsZoneGroupsDeleteOperation StartDelete(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PrivateDnsZoneGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateDnsZoneGroupsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>
+    public partial class PrivateEndpointsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PrivateEndpoint>
     {
-        internal PrivateDnsZoneGroupsCreateOrUpdateOperation() { }
+        internal PrivateEndpointsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.PrivateEndpoint Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateDnsZoneGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PrivateEndpointsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PrivateDnsZoneGroupsDeleteOperation() { }
+        internal PrivateEndpointsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2183,9 +2209,9 @@ internal PrivateDnsZoneGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointsClient
+    public partial class PrivateEndpointsOperations
     {
-        protected PrivateEndpointsClient() { }
+        protected PrivateEndpointsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpoint> Get(string resourceGroupName, string privateEndpointName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpoint>> GetAsync(string resourceGroupName, string privateEndpointName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.PrivateEndpoint> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2197,22 +2223,35 @@ protected PrivateEndpointsClient() { }
         public virtual Azure.ResourceManager.Network.PrivateEndpointsDeleteOperation StartDelete(string resourceGroupName, string privateEndpointName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.PrivateEndpointsDeleteOperation> StartDeleteAsync(string resourceGroupName, string privateEndpointName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PrivateEndpoint>
+    public partial class PrivateLinkServicesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PrivateLinkService>
     {
-        internal PrivateEndpointsCreateOrUpdateOperation() { }
+        internal PrivateLinkServicesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.PrivateEndpoint Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.PrivateLinkService Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PrivateLinkServicesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PrivateEndpointsDeleteOperation() { }
+        internal PrivateLinkServicesDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateLinkServicesDeletePrivateEndpointConnectionOperation : Azure.Operation<Azure.Response>
+    {
+        internal PrivateLinkServicesDeletePrivateEndpointConnectionOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2223,9 +2262,9 @@ internal PrivateEndpointsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkServicesClient
+    public partial class PrivateLinkServicesOperations
     {
-        protected PrivateLinkServicesClient() { }
+        protected PrivateLinkServicesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibility(string location, Azure.ResourceManager.Network.Models.CheckPrivateLinkServiceVisibilityRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkServiceVisibility>> CheckPrivateLinkServiceVisibilityAsync(string location, Azure.ResourceManager.Network.Models.CheckPrivateLinkServiceVisibilityRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibilityByResourceGroup(string location, string resourceGroupName, Azure.ResourceManager.Network.Models.CheckPrivateLinkServiceVisibilityRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2253,35 +2292,22 @@ protected PrivateLinkServicesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpointConnection> UpdatePrivateEndpointConnection(string resourceGroupName, string serviceName, string peConnectionName, Azure.ResourceManager.Network.Models.PrivateEndpointConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PrivateEndpointConnection>> UpdatePrivateEndpointConnectionAsync(string resourceGroupName, string serviceName, string peConnectionName, Azure.ResourceManager.Network.Models.PrivateEndpointConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkServicesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PrivateLinkService>
-    {
-        internal PrivateLinkServicesCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.PrivateLinkService Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class PrivateLinkServicesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PublicIPAddressesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PublicIPAddress>
     {
-        internal PrivateLinkServicesDeleteOperation() { }
+        internal PublicIPAddressesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.PublicIPAddress Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkServicesDeletePrivateEndpointConnectionOperation : Azure.Operation<Azure.Response>
+    public partial class PublicIPAddressesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PrivateLinkServicesDeletePrivateEndpointConnectionOperation() { }
+        internal PublicIPAddressesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2292,9 +2318,9 @@ internal PrivateLinkServicesDeletePrivateEndpointConnectionOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPAddressesClient
+    public partial class PublicIPAddressesOperations
     {
-        protected PublicIPAddressesClient() { }
+        protected PublicIPAddressesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress> Get(string resourceGroupName, string publicIpAddressName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress>> GetAsync(string resourceGroupName, string publicIpAddressName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress> GetVirtualMachineScaleSetPublicIPAddress(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string publicIpAddressName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2314,22 +2340,22 @@ protected PublicIPAddressesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress> UpdateTags(string resourceGroupName, string publicIpAddressName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress>> UpdateTagsAsync(string resourceGroupName, string publicIpAddressName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPAddressesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PublicIPAddress>
+    public partial class PublicIPPrefixesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PublicIPPrefix>
     {
-        internal PublicIPAddressesCreateOrUpdateOperation() { }
+        internal PublicIPPrefixesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.PublicIPAddress Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.PublicIPPrefix Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPAddressesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PublicIPPrefixesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PublicIPAddressesDeleteOperation() { }
+        internal PublicIPPrefixesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2340,9 +2366,9 @@ internal PublicIPAddressesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPPrefixesClient
+    public partial class PublicIPPrefixesOperations
     {
-        protected PublicIPPrefixesClient() { }
+        protected PublicIPPrefixesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix> Get(string resourceGroupName, string publicIpPrefixName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix>> GetAsync(string resourceGroupName, string publicIpPrefixName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.PublicIPPrefix> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2356,22 +2382,28 @@ protected PublicIPPrefixesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix> UpdateTags(string resourceGroupName, string publicIpPrefixName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix>> UpdateTagsAsync(string resourceGroupName, string publicIpPrefixName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPPrefixesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.PublicIPPrefix>
+    public partial class ResourceNavigationLinksOperations
     {
-        internal PublicIPPrefixesCreateOrUpdateOperation() { }
+        protected ResourceNavigationLinksOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ResourceNavigationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ResourceNavigationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class RouteFilterRulesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.RouteFilterRule>
+    {
+        internal RouteFilterRulesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.PublicIPPrefix Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.RouteFilterRule Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPPrefixesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RouteFilterRulesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PublicIPPrefixesDeleteOperation() { }
+        internal RouteFilterRulesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2382,15 +2414,9 @@ internal PublicIPPrefixesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceNavigationLinksClient
-    {
-        protected ResourceNavigationLinksClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ResourceNavigationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ResourceNavigationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class RouteFilterRulesClient
+    public partial class RouteFilterRulesOperations
     {
-        protected RouteFilterRulesClient() { }
+        protected RouteFilterRulesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.RouteFilterRule> Get(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilterRule>> GetAsync(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.RouteFilterRule> ListByRouteFilter(string resourceGroupName, string routeFilterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2400,22 +2426,22 @@ protected RouteFilterRulesClient() { }
         public virtual Azure.ResourceManager.Network.RouteFilterRulesDeleteOperation StartDelete(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.RouteFilterRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFilterRulesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.RouteFilterRule>
+    public partial class RouteFiltersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.RouteFilter>
     {
-        internal RouteFilterRulesCreateOrUpdateOperation() { }
+        internal RouteFiltersCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.RouteFilterRule Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.RouteFilter Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFilterRulesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RouteFiltersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RouteFilterRulesDeleteOperation() { }
+        internal RouteFiltersDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2426,9 +2452,9 @@ internal RouteFilterRulesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFiltersClient
+    public partial class RouteFiltersOperations
     {
-        protected RouteFiltersClient() { }
+        protected RouteFiltersOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter> Get(string resourceGroupName, string routeFilterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter>> GetAsync(string resourceGroupName, string routeFilterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.RouteFilter> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2442,22 +2468,22 @@ protected RouteFiltersClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter> UpdateTags(string resourceGroupName, string routeFilterName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter>> UpdateTagsAsync(string resourceGroupName, string routeFilterName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFiltersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.RouteFilter>
+    public partial class RoutesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.Route>
     {
-        internal RouteFiltersCreateOrUpdateOperation() { }
+        internal RoutesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.RouteFilter Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.Route Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteFilter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.Route>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.Route>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFiltersDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RoutesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RouteFiltersDeleteOperation() { }
+        internal RoutesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2468,9 +2494,9 @@ internal RouteFiltersDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RoutesClient
+    public partial class RoutesOperations
     {
-        protected RoutesClient() { }
+        protected RoutesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.Route> Get(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.Route>> GetAsync(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.Route> List(string resourceGroupName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2480,22 +2506,22 @@ protected RoutesClient() { }
         public virtual Azure.ResourceManager.Network.RoutesDeleteOperation StartDelete(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.RoutesDeleteOperation> StartDeleteAsync(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RoutesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.Route>
+    public partial class RouteTablesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.RouteTable>
     {
-        internal RoutesCreateOrUpdateOperation() { }
+        internal RouteTablesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.Route Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.RouteTable Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.Route>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.Route>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteTable>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteTable>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RoutesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RouteTablesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RoutesDeleteOperation() { }
+        internal RouteTablesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2506,9 +2532,9 @@ internal RoutesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteTablesClient
+    public partial class RouteTablesOperations
     {
-        protected RouteTablesClient() { }
+        protected RouteTablesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.RouteTable> Get(string resourceGroupName, string routeTableName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.RouteTable>> GetAsync(string resourceGroupName, string routeTableName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.RouteTable> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2522,22 +2548,22 @@ protected RouteTablesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.RouteTable> UpdateTags(string resourceGroupName, string routeTableName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.RouteTable>> UpdateTagsAsync(string resourceGroupName, string routeTableName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteTablesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.RouteTable>
+    public partial class SecurityPartnerProvidersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>
     {
-        internal RouteTablesCreateOrUpdateOperation() { }
+        internal SecurityPartnerProvidersCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.RouteTable Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.SecurityPartnerProvider Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteTable>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.RouteTable>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteTablesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class SecurityPartnerProvidersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RouteTablesDeleteOperation() { }
+        internal SecurityPartnerProvidersDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2548,9 +2574,9 @@ internal RouteTablesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SecurityPartnerProvidersClient
+    public partial class SecurityPartnerProvidersOperations
     {
-        protected SecurityPartnerProvidersClient() { }
+        protected SecurityPartnerProvidersOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider> Get(string resourceGroupName, string securityPartnerProviderName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>> GetAsync(string resourceGroupName, string securityPartnerProviderName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.SecurityPartnerProvider> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2564,44 +2590,6 @@ protected SecurityPartnerProvidersClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider> UpdateTags(string resourceGroupName, string securityPartnerProviderName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>> UpdateTagsAsync(string resourceGroupName, string securityPartnerProviderName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SecurityPartnerProvidersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>
-    {
-        internal SecurityPartnerProvidersCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.SecurityPartnerProvider Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class SecurityPartnerProvidersDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal SecurityPartnerProvidersDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class SecurityRulesClient
-    {
-        protected SecurityRulesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.SecurityRule> List(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.SecurityRule> ListAsync(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.SecurityRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.ResourceManager.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SecurityRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.ResourceManager.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.SecurityRulesDeleteOperation StartDelete(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SecurityRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class SecurityRulesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.SecurityRule>
     {
         internal SecurityRulesCreateOrUpdateOperation() { }
@@ -2628,31 +2616,23 @@ internal SecurityRulesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceAssociationLinksClient
-    {
-        protected ServiceAssociationLinksClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceAssociationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceAssociationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class ServiceClient
+    public partial class SecurityRulesOperations
     {
-        protected ServiceClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DnsNameAvailabilityResult> CheckDnsNameAvailability(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DnsNameAvailabilityResult>> CheckDnsNameAvailabilityAsync(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionSessionState> DisconnectActiveSessions(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionSessionState> DisconnectActiveSessionsAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionShareableLink> GetBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionShareableLink> GetBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceDeleteBastionShareableLinkOperation StartDeleteBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceDeleteBastionShareableLinkOperation> StartDeleteBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation StartGeneratevirtualwanvpnserverconfigurationvpnprofile(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation> StartGeneratevirtualwanvpnserverconfigurationvpnprofileAsync(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceGetActiveSessionsOperation StartGetActiveSessions(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceGetActiveSessionsOperation> StartGetActiveSessionsAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServicePutBastionShareableLinkOperation StartPutBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServicePutBastionShareableLinkOperation> StartPutBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualWanSecurityProviders> SupportedSecurityProviders(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWanSecurityProviders>> SupportedSecurityProvidersAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected SecurityRulesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.SecurityRule> List(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.SecurityRule> ListAsync(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.SecurityRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.ResourceManager.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SecurityRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.ResourceManager.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.SecurityRulesDeleteOperation StartDelete(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SecurityRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ServiceAssociationLinksOperations
+    {
+        protected ServiceAssociationLinksOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceAssociationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceAssociationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ServiceDeleteBastionShareableLinkOperation : Azure.Operation<Azure.Response>
     {
@@ -2667,22 +2647,6 @@ internal ServiceDeleteBastionShareableLinkOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceEndpointPoliciesClient
-    {
-        protected ServiceEndpointPoliciesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> Get(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceEndpointPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceEndpointPoliciesDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> UpdateTags(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy>> UpdateTagsAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ServiceEndpointPoliciesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy>
     {
         internal ServiceEndpointPoliciesCreateOrUpdateOperation() { }
@@ -2709,17 +2673,21 @@ internal ServiceEndpointPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceEndpointPolicyDefinitionsClient
+    public partial class ServiceEndpointPoliciesOperations
     {
-        protected ServiceEndpointPolicyDefinitionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition> Get(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroup(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroupAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ServiceEndpointPoliciesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> Get(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceEndpointPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceEndpointPoliciesDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy> UpdateTags(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicy>> UpdateTagsAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition>
     {
@@ -2747,6 +2715,18 @@ internal ServiceEndpointPolicyDefinitionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ServiceEndpointPolicyDefinitionsOperations
+    {
+        protected ServiceEndpointPolicyDefinitionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition> Get(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroup(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroupAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.ResourceManager.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceEndpointPolicyDefinitionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnProfileResponse>
     {
         internal ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation() { }
@@ -2773,6 +2753,26 @@ internal ServiceGetActiveSessionsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.BastionActiveSessionListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.BastionActiveSessionListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ServiceOperations
+    {
+        protected ServiceOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.DnsNameAvailabilityResult> CheckDnsNameAvailability(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.DnsNameAvailabilityResult>> CheckDnsNameAvailabilityAsync(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionSessionState> DisconnectActiveSessions(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionSessionState> DisconnectActiveSessionsAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.BastionShareableLink> GetBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.BastionShareableLink> GetBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceDeleteBastionShareableLinkOperation StartDeleteBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceDeleteBastionShareableLinkOperation> StartDeleteBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation StartGeneratevirtualwanvpnserverconfigurationvpnprofile(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation> StartGeneratevirtualwanvpnserverconfigurationvpnprofileAsync(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServiceGetActiveSessionsOperation StartGetActiveSessions(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServiceGetActiveSessionsOperation> StartGetActiveSessionsAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.ServicePutBastionShareableLinkOperation StartPutBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.ServicePutBastionShareableLinkOperation> StartPutBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.ResourceManager.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualWanSecurityProviders> SupportedSecurityProviders(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWanSecurityProviders>> SupportedSecurityProvidersAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ServicePutBastionShareableLinkOperation : Azure.Operation<Azure.ResourceManager.Network.Models.BastionShareableLinkListResult>
     {
         internal ServicePutBastionShareableLinkOperation() { }
@@ -2786,28 +2786,12 @@ internal ServicePutBastionShareableLinkOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.BastionShareableLinkListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.BastionShareableLinkListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceTagsClient
+    public partial class ServiceTagsOperations
     {
-        protected ServiceTagsClient() { }
+        protected ServiceTagsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ServiceTagsListResult> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.ServiceTagsListResult>> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SubnetsClient
-    {
-        protected SubnetsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.Subnet> Get(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.Subnet>> GetAsync(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.Subnet> List(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.Subnet> ListAsync(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.SubnetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.SubnetsDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.SubnetsPrepareNetworkPoliciesOperation StartPrepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsPrepareNetworkPoliciesOperation> StartPrepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.SubnetsUnprepareNetworkPoliciesOperation StartUnprepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsUnprepareNetworkPoliciesOperation> StartUnprepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class SubnetsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.Subnet>
     {
         internal SubnetsCreateOrUpdateOperation() { }
@@ -2834,6 +2818,22 @@ internal SubnetsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class SubnetsOperations
+    {
+        protected SubnetsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.Subnet> Get(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.Subnet>> GetAsync(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.Subnet> List(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.Subnet> ListAsync(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.SubnetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.SubnetsDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.SubnetsPrepareNetworkPoliciesOperation StartPrepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsPrepareNetworkPoliciesOperation> StartPrepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.SubnetsUnprepareNetworkPoliciesOperation StartUnprepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.SubnetsUnprepareNetworkPoliciesOperation> StartUnprepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.ResourceManager.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class SubnetsPrepareNetworkPoliciesOperation : Azure.Operation<Azure.Response>
     {
         internal SubnetsPrepareNetworkPoliciesOperation() { }
@@ -2860,15 +2860,41 @@ internal SubnetsUnprepareNetworkPoliciesOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
-        protected UsagesClient() { }
+        protected UsagesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.Usage> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.Usage> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubRouteTableV2SClient
+    public partial class VirtualHubRouteTableV2SCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>
+    {
+        internal VirtualHubRouteTableV2SCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2 Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualHubRouteTableV2SDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal VirtualHubRouteTableV2SDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualHubRouteTableV2SOperations
     {
-        protected VirtualHubRouteTableV2SClient() { }
+        protected VirtualHubRouteTableV2SOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2> Get(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2878,22 +2904,22 @@ protected VirtualHubRouteTableV2SClient() { }
         public virtual Azure.ResourceManager.Network.VirtualHubRouteTableV2SDeleteOperation StartDelete(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualHubRouteTableV2SDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubRouteTableV2SCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>
+    public partial class VirtualHubsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualHub>
     {
-        internal VirtualHubRouteTableV2SCreateOrUpdateOperation() { }
+        internal VirtualHubsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2 Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualHub Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubRouteTableV2SDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualHubsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualHubRouteTableV2SDeleteOperation() { }
+        internal VirtualHubsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2904,9 +2930,9 @@ internal VirtualHubRouteTableV2SDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubsClient
+    public partial class VirtualHubsOperations
     {
-        protected VirtualHubsClient() { }
+        protected VirtualHubsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub> Get(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub>> GetAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualHub> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2920,22 +2946,22 @@ protected VirtualHubsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub> UpdateTags(string resourceGroupName, string virtualHubName, Azure.ResourceManager.Network.Models.TagsObject virtualHubParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub>> UpdateTagsAsync(string resourceGroupName, string virtualHubName, Azure.ResourceManager.Network.Models.TagsObject virtualHubParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualHub>
+    public partial class VirtualNetworkGatewayConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>
     {
-        internal VirtualHubsCreateOrUpdateOperation() { }
+        internal VirtualNetworkGatewayConnectionsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualHub Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualHub>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualNetworkGatewayConnectionsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualHubsDeleteOperation() { }
+        internal VirtualNetworkGatewayConnectionsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2946,9 +2972,9 @@ internal VirtualHubsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkGatewayConnectionsClient
+    public partial class VirtualNetworkGatewayConnectionsOperations
     {
-        protected VirtualNetworkGatewayConnectionsClient() { }
+        protected VirtualNetworkGatewayConnectionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection> Get(string resourceGroupName, string virtualNetworkGatewayConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> GetAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.ConnectionSharedKey> GetSharedKey(string resourceGroupName, string virtualNetworkGatewayConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2970,32 +2996,6 @@ protected VirtualNetworkGatewayConnectionsClient() { }
         public virtual Azure.ResourceManager.Network.VirtualNetworkGatewayConnectionsUpdateTagsOperation StartUpdateTags(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewayConnectionsUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkGatewayConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>
-    {
-        internal VirtualNetworkGatewayConnectionsCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VirtualNetworkGatewayConnectionsDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal VirtualNetworkGatewayConnectionsDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualNetworkGatewayConnectionsResetSharedKeyOperation : Azure.Operation<Azure.ResourceManager.Network.Models.ConnectionResetSharedKey>
     {
         internal VirtualNetworkGatewayConnectionsResetSharedKeyOperation() { }
@@ -3061,54 +3061,6 @@ internal VirtualNetworkGatewayConnectionsUpdateTagsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkGatewaysClient
-    {
-        protected VirtualNetworkGatewaysClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGateway> Get(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGateway>> GetAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VirtualNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnections(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation StartDisconnectVirtualNetworkGatewayVpnConnections(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation> StartDisconnectVirtualNetworkGatewayVpnConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation StartGeneratevpnclientpackage(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation> StartGeneratevpnclientpackageAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation StartGetAdvertisedRoutes(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation> StartGetAdvertisedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation StartGetBgpPeerStatus(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation> StartGetBgpPeerStatusAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation StartGetLearnedRoutes(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation> StartGetLearnedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation StartGetVpnclientConnectionHealth(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation> StartGetVpnclientConnectionHealthAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation StartGetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation> StartGetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation StartGetVpnProfilePackageUrl(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation> StartGetVpnProfilePackageUrlAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysResetOperation StartReset(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysResetOperation> StartResetAsync(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation StartResetVpnClientSharedKey(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation> StartResetVpnClientSharedKeyAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation StartSetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation> StartSetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysStartPacketCaptureOperation StartStartPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysStartPacketCaptureOperation> StartStartPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysStopPacketCaptureOperation StartStopPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysStopPacketCaptureOperation> StartStopPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysUpdateTagsOperation StartUpdateTags(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> SupportedVpnDevices(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> SupportedVpnDevicesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> VpnDeviceConfigurationScript(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.ResourceManager.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> VpnDeviceConfigurationScriptAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.ResourceManager.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualNetworkGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkGateway>
     {
         internal VirtualNetworkGatewaysCreateOrUpdateOperation() { }
@@ -3252,6 +3204,54 @@ internal VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<string>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<string>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualNetworkGatewaysOperations
+    {
+        protected VirtualNetworkGatewaysOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGateway> Get(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGateway>> GetAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VirtualNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnections(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation StartDisconnectVirtualNetworkGatewayVpnConnections(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation> StartDisconnectVirtualNetworkGatewayVpnConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation StartGeneratevpnclientpackage(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation> StartGeneratevpnclientpackageAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation StartGetAdvertisedRoutes(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation> StartGetAdvertisedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation StartGetBgpPeerStatus(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation> StartGetBgpPeerStatusAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation StartGetLearnedRoutes(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation> StartGetLearnedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation StartGetVpnclientConnectionHealth(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation> StartGetVpnclientConnectionHealthAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation StartGetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation> StartGetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation StartGetVpnProfilePackageUrl(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation> StartGetVpnProfilePackageUrlAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysResetOperation StartReset(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysResetOperation> StartResetAsync(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation StartResetVpnClientSharedKey(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation> StartResetVpnClientSharedKeyAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation StartSetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation> StartSetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysStartPacketCaptureOperation StartStartPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysStartPacketCaptureOperation> StartStartPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysStopPacketCaptureOperation StartStopPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysStopPacketCaptureOperation> StartStopPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VirtualNetworkGatewaysUpdateTagsOperation StartUpdateTags(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkGatewaysUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<string> SupportedVpnDevices(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<string>> SupportedVpnDevicesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<string> VpnDeviceConfigurationScript(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.ResourceManager.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<string>> VpnDeviceConfigurationScriptAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.ResourceManager.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualNetworkGatewaysResetOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkGateway>
     {
         internal VirtualNetworkGatewaysResetOperation() { }
@@ -3330,9 +3330,35 @@ internal VirtualNetworkGatewaysUpdateTagsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkPeeringsClient
+    public partial class VirtualNetworkPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>
+    {
+        internal VirtualNetworkPeeringsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualNetworkPeering Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualNetworkPeeringsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal VirtualNetworkPeeringsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualNetworkPeeringsOperations
     {
-        protected VirtualNetworkPeeringsClient() { }
+        protected VirtualNetworkPeeringsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkPeering> Get(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>> GetAsync(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualNetworkPeering> List(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3342,22 +3368,22 @@ protected VirtualNetworkPeeringsClient() { }
         public virtual Azure.ResourceManager.Network.VirtualNetworkPeeringsDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualNetworkPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>
+    public partial class VirtualNetworksCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetwork>
     {
-        internal VirtualNetworkPeeringsCreateOrUpdateOperation() { }
+        internal VirtualNetworksCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualNetworkPeering Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualNetwork Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkPeeringsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualNetworksDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualNetworkPeeringsDeleteOperation() { }
+        internal VirtualNetworksDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3368,9 +3394,9 @@ internal VirtualNetworkPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworksClient
+    public partial class VirtualNetworksOperations
     {
-        protected VirtualNetworksClient() { }
+        protected VirtualNetworksOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.IPAddressAvailabilityResult> CheckIPAddressAvailability(string resourceGroupName, string virtualNetworkName, string ipAddress, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.IPAddressAvailabilityResult>> CheckIPAddressAvailabilityAsync(string resourceGroupName, string virtualNetworkName, string ipAddress, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork> Get(string resourceGroupName, string virtualNetworkName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3388,22 +3414,22 @@ protected VirtualNetworksClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork> UpdateTags(string resourceGroupName, string virtualNetworkName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork>> UpdateTagsAsync(string resourceGroupName, string virtualNetworkName, Azure.ResourceManager.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworksCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetwork>
+    public partial class VirtualNetworkTapsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkTap>
     {
-        internal VirtualNetworksCreateOrUpdateOperation() { }
+        internal VirtualNetworkTapsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualNetwork Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualNetworkTap Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworksDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualNetworkTapsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualNetworksDeleteOperation() { }
+        internal VirtualNetworkTapsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3414,9 +3440,9 @@ internal VirtualNetworksDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkTapsClient
+    public partial class VirtualNetworkTapsOperations
     {
-        protected VirtualNetworkTapsClient() { }
+        protected VirtualNetworkTapsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap> Get(string resourceGroupName, string tapName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap>> GetAsync(string resourceGroupName, string tapName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualNetworkTap> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3430,22 +3456,22 @@ protected VirtualNetworkTapsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap> UpdateTags(string resourceGroupName, string tapName, Azure.ResourceManager.Network.Models.TagsObject tapParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap>> UpdateTagsAsync(string resourceGroupName, string tapName, Azure.ResourceManager.Network.Models.TagsObject tapParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkTapsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualNetworkTap>
+    public partial class VirtualRouterPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualRouterPeering>
     {
-        internal VirtualNetworkTapsCreateOrUpdateOperation() { }
+        internal VirtualRouterPeeringsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualNetworkTap Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualRouterPeering Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkTapsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualRouterPeeringsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualNetworkTapsDeleteOperation() { }
+        internal VirtualRouterPeeringsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3456,9 +3482,9 @@ internal VirtualNetworkTapsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRouterPeeringsClient
+    public partial class VirtualRouterPeeringsOperations
     {
-        protected VirtualRouterPeeringsClient() { }
+        protected VirtualRouterPeeringsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouterPeering> Get(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouterPeering>> GetAsync(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualRouterPeering> List(string resourceGroupName, string virtualRouterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3468,22 +3494,22 @@ protected VirtualRouterPeeringsClient() { }
         public virtual Azure.ResourceManager.Network.VirtualRouterPeeringsDeleteOperation StartDelete(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualRouterPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRouterPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualRouterPeering>
+    public partial class VirtualRoutersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualRouter>
     {
-        internal VirtualRouterPeeringsCreateOrUpdateOperation() { }
+        internal VirtualRoutersCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualRouterPeering Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualRouter Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRouterPeeringsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualRoutersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualRouterPeeringsDeleteOperation() { }
+        internal VirtualRoutersDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3494,9 +3520,9 @@ internal VirtualRouterPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRoutersClient
+    public partial class VirtualRoutersOperations
     {
-        protected VirtualRoutersClient() { }
+        protected VirtualRoutersOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouter> Get(string resourceGroupName, string virtualRouterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouter>> GetAsync(string resourceGroupName, string virtualRouterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualRouter> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3508,22 +3534,22 @@ protected VirtualRoutersClient() { }
         public virtual Azure.ResourceManager.Network.VirtualRoutersDeleteOperation StartDelete(string resourceGroupName, string virtualRouterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VirtualRoutersDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualRouterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRoutersCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualRouter>
+    public partial class VirtualWansCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualWAN>
     {
-        internal VirtualRoutersCreateOrUpdateOperation() { }
+        internal VirtualWansCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualRouter Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VirtualWAN Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRoutersDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualWansDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualRoutersDeleteOperation() { }
+        internal VirtualWansDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3534,9 +3560,9 @@ internal VirtualRoutersDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualWansClient
+    public partial class VirtualWansOperations
     {
-        protected VirtualWansClient() { }
+        protected VirtualWansOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN> Get(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN>> GetAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VirtualWAN> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3550,22 +3576,22 @@ protected VirtualWansClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN> UpdateTags(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.TagsObject wANParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN>> UpdateTagsAsync(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.TagsObject wANParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualWansCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VirtualWAN>
+    public partial class VpnConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnConnection>
     {
-        internal VirtualWansCreateOrUpdateOperation() { }
+        internal VpnConnectionsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VirtualWAN Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VpnConnection Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualWansDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VpnConnectionsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualWansDeleteOperation() { }
+        internal VpnConnectionsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3576,9 +3602,9 @@ internal VirtualWansDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnConnectionsClient
+    public partial class VpnConnectionsOperations
     {
-        protected VpnConnectionsClient() { }
+        protected VpnConnectionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnConnection> Get(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnConnection> ListByVpnGateway(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3588,22 +3614,22 @@ protected VpnConnectionsClient() { }
         public virtual Azure.ResourceManager.Network.VpnConnectionsDeleteOperation StartDelete(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnConnection>
+    public partial class VpnGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnGateway>
     {
-        internal VpnConnectionsCreateOrUpdateOperation() { }
+        internal VpnGatewaysCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VpnConnection Value { get { throw null; } }
+        public override Azure.ResourceManager.Network.Models.VpnGateway Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnConnectionsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VpnGatewaysDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VpnConnectionsDeleteOperation() { }
+        internal VpnGatewaysDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3614,9 +3640,9 @@ internal VpnConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnGatewaysClient
+    public partial class VpnGatewaysOperations
     {
-        protected VpnGatewaysClient() { }
+        protected VpnGatewaysOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway> Get(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> GetAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnGateway> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3632,32 +3658,6 @@ protected VpnGatewaysClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway> UpdateTags(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.TagsObject vpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, Azure.ResourceManager.Network.Models.TagsObject vpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnGateway>
-    {
-        internal VpnGatewaysCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Network.Models.VpnGateway Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VpnGatewaysDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal VpnGatewaysDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VpnGatewaysResetOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnGateway>
     {
         internal VpnGatewaysResetOperation() { }
@@ -3671,18 +3671,12 @@ internal VpnGatewaysResetOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnLinkConnectionsClient
+    public partial class VpnLinkConnectionsOperations
     {
-        protected VpnLinkConnectionsClient() { }
+        protected VpnLinkConnectionsOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnSiteLinkConnection> ListByVpnConnection(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnSiteLinkConnection> ListByVpnConnectionAsync(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnServerConfigurationsAssociatedWithVirtualWanClient
-    {
-        protected VpnServerConfigurationsAssociatedWithVirtualWanClient() { }
-        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation StartList(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation> StartListAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VpnServerConfigurationsAssociatedWithVirtualWanListOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnServerConfigurationsResponse>
     {
         internal VpnServerConfigurationsAssociatedWithVirtualWanListOperation() { }
@@ -3696,21 +3690,11 @@ internal VpnServerConfigurationsAssociatedWithVirtualWanListOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfigurationsResponse>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfigurationsResponse>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnServerConfigurationsClient
+    public partial class VpnServerConfigurationsAssociatedWithVirtualWanOperations
     {
-        protected VpnServerConfigurationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration> Get(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration>> GetAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnServerConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsDeleteOperation StartDelete(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnServerConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration> UpdateTags(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration>> UpdateTagsAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected VpnServerConfigurationsAssociatedWithVirtualWanOperations() { }
+        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation StartList(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation> StartListAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class VpnServerConfigurationsCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnServerConfiguration>
     {
@@ -3738,42 +3722,36 @@ internal VpnServerConfigurationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnSiteLinkConnectionsClient
+    public partial class VpnServerConfigurationsOperations
+    {
+        protected VpnServerConfigurationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration> Get(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration>> GetAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnServerConfiguration> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnServerConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VpnServerConfigurationsDeleteOperation StartDelete(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnServerConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration> UpdateTags(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnServerConfiguration>> UpdateTagsAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.ResourceManager.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VpnSiteLinkConnectionsOperations
     {
-        protected VpnSiteLinkConnectionsClient() { }
+        protected VpnSiteLinkConnectionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnSiteLinkConnection> Get(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnSiteLinkConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnSiteLinksClient
+    public partial class VpnSiteLinksOperations
     {
-        protected VpnSiteLinksClient() { }
+        protected VpnSiteLinksOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnSiteLink> Get(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnSiteLink>> GetAsync(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnSiteLink> ListByVpnSite(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnSiteLink> ListByVpnSiteAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnSitesClient
-    {
-        protected VpnSitesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnSite> Get(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnSite>> GetAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnSite> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnSite> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnSite> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnSite> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnSitesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnSitesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.VpnSitesDeleteOperation StartDelete(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnSitesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnSite> UpdateTags(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnSite>> UpdateTagsAsync(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VpnSitesConfigurationClient
-    {
-        protected VpnSitesConfigurationClient() { }
-        public virtual Azure.ResourceManager.Network.VpnSitesConfigurationDownloadOperation StartDownload(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnSitesConfigurationDownloadOperation> StartDownloadAsync(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VpnSitesConfigurationDownloadOperation : Azure.Operation<Azure.Response>
     {
         internal VpnSitesConfigurationDownloadOperation() { }
@@ -3787,6 +3765,12 @@ internal VpnSitesConfigurationDownloadOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VpnSitesConfigurationOperations
+    {
+        protected VpnSitesConfigurationOperations() { }
+        public virtual Azure.ResourceManager.Network.VpnSitesConfigurationDownloadOperation StartDownload(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnSitesConfigurationDownloadOperation> StartDownloadAsync(string resourceGroupName, string virtualWANName, Azure.ResourceManager.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VpnSitesCreateOrUpdateOperation : Azure.Operation<Azure.ResourceManager.Network.Models.VpnSite>
     {
         internal VpnSitesCreateOrUpdateOperation() { }
@@ -3813,19 +3797,21 @@ internal VpnSitesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class WebApplicationFirewallPoliciesClient
+    public partial class VpnSitesOperations
     {
-        protected WebApplicationFirewallPoliciesClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> CreateOrUpdate(string resourceGroupName, string policyName, Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy>> CreateOrUpdateAsync(string resourceGroupName, string policyName, Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> Get(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy>> GetAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Network.WebApplicationFirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.WebApplicationFirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected VpnSitesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnSite> Get(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnSite>> GetAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnSite> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnSite> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.VpnSite> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.VpnSite> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VpnSitesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnSitesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.VpnSitesDeleteOperation StartDelete(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.VpnSitesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.VpnSite> UpdateTags(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.VpnSite>> UpdateTagsAsync(string resourceGroupName, string vpnSiteName, Azure.ResourceManager.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class WebApplicationFirewallPoliciesDeleteOperation : Azure.Operation<Azure.Response>
     {
@@ -3840,6 +3826,20 @@ internal WebApplicationFirewallPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class WebApplicationFirewallPoliciesOperations
+    {
+        protected WebApplicationFirewallPoliciesOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> CreateOrUpdate(string resourceGroupName, string policyName, Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy>> CreateOrUpdateAsync(string resourceGroupName, string policyName, Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> Get(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy>> GetAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Network.Models.WebApplicationFirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Network.WebApplicationFirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Network.WebApplicationFirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
 }
 namespace Azure.ResourceManager.Network.Models
 {
diff --git a/sdk/resources/Azure.ResourceManager.Resources/api/Azure.ResourceManager.Resources.netstandard2.0.cs b/sdk/resources/Azure.ResourceManager.Resources/api/Azure.ResourceManager.Resources.netstandard2.0.cs
index 4663a73fde9d5..f3d5c4efc4f86 100644
--- a/sdk/resources/Azure.ResourceManager.Resources/api/Azure.ResourceManager.Resources.netstandard2.0.cs
+++ b/sdk/resources/Azure.ResourceManager.Resources/api/Azure.ResourceManager.Resources.netstandard2.0.cs
@@ -1,23 +1,5 @@
 namespace Azure.ResourceManager.Resources
 {
-    public partial class ApplicationDefinitionsClient
-    {
-        protected ApplicationDefinitionsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition> Get(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition>> GetAsync(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition> GetById(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition>> GetByIdAsync(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.ApplicationDefinition> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.ApplicationDefinition> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationDefinitionName, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationDefinitionName, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateByIdOperation StartCreateOrUpdateById(string applicationDefinitionId, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string applicationDefinitionId, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteOperation StartDelete(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteByIdOperation StartDeleteById(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteByIdOperation> StartDeleteByIdAsync(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ApplicationDefinitionsCreateOrUpdateByIdOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.ApplicationDefinition>
     {
         internal ApplicationDefinitionsCreateOrUpdateByIdOperation() { }
@@ -70,29 +52,23 @@ internal ApplicationDefinitionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationsClient
+    public partial class ApplicationDefinitionsOperations
     {
-        protected ApplicationsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> Get(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> GetAsync(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> GetById(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> GetByIdAsync(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Application> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.Application> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Application> ListBySubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.Application> ListBySubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateByIdOperation StartCreateOrUpdateById(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationsDeleteOperation StartDelete(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationsDeleteByIdOperation StartDeleteById(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsDeleteByIdOperation> StartDeleteByIdAsync(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> Update(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> UpdateAsync(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> UpdateById(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> UpdateByIdAsync(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ApplicationDefinitionsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition> Get(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition>> GetAsync(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition> GetById(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ApplicationDefinition>> GetByIdAsync(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.ApplicationDefinition> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.ApplicationDefinition> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationDefinitionName, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationDefinitionName, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateByIdOperation StartCreateOrUpdateById(string applicationDefinitionId, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string applicationDefinitionId, Azure.ResourceManager.Resources.Models.ApplicationDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteOperation StartDelete(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteByIdOperation StartDeleteById(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationDefinitionsDeleteByIdOperation> StartDeleteByIdAsync(string applicationDefinitionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ApplicationsCreateOrUpdateByIdOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.Application>
     {
@@ -146,15 +122,39 @@ internal ApplicationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AuthorizationClient
+    public partial class ApplicationsOperations
+    {
+        protected ApplicationsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> Get(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> GetAsync(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> GetById(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> GetByIdAsync(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Application> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.Application> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Application> ListBySubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.Application> ListBySubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateByIdOperation StartCreateOrUpdateById(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationsDeleteOperation StartDelete(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationsDeleteByIdOperation StartDeleteById(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ApplicationsDeleteByIdOperation> StartDeleteByIdAsync(string applicationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> Update(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> UpdateAsync(string resourceGroupName, string applicationName, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Application> UpdateById(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Application>> UpdateByIdAsync(string applicationId, Azure.ResourceManager.Resources.Models.Application parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class AuthorizationOperations
     {
-        protected AuthorizationClient() { }
+        protected AuthorizationOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.OperationAutoGenerated2> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.OperationAutoGenerated2> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DeploymentClient
+    public partial class DeploymentOperations
     {
-        protected DeploymentClient() { }
+        protected DeploymentOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentOperation> Get(string resourceGroupName, string deploymentName, string operationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentOperation>> GetAsync(string resourceGroupName, string deploymentName, string operationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentOperation> GetAtManagementGroupScope(string groupId, string deploymentName, string operationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -176,96 +176,6 @@ protected DeploymentClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentOperation> ListAtTenantScope(string deploymentName, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentOperation> ListAtTenantScopeAsync(string deploymentName, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DeploymentsClient
-    {
-        protected DeploymentsClient() { }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.TemplateHashResult> CalculateTemplateHash(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.TemplateHashResult>> CalculateTemplateHashAsync(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response Cancel(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CancelAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CancelAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CancelAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CancelAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistence(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistenceAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistenceAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistenceAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistenceAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplate(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> Get(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtManagementGroupScope(string groupId, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtManagementGroupScopeAsync(string groupId, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtScope(string scope, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtScopeAsync(string scope, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtSubscriptionScope(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtSubscriptionScopeAsync(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtTenantScope(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtTenantScopeAsync(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListByResourceGroup(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListByResourceGroupAsync(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtManagementGroupScopeOperation StartCreateOrUpdateAtManagementGroupScope(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtManagementGroupScopeOperation> StartCreateOrUpdateAtManagementGroupScopeAsync(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtScopeOperation StartCreateOrUpdateAtScope(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtScopeOperation> StartCreateOrUpdateAtScopeAsync(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtSubscriptionScopeOperation StartCreateOrUpdateAtSubscriptionScope(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtSubscriptionScopeOperation> StartCreateOrUpdateAtSubscriptionScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtTenantScopeOperation StartCreateOrUpdateAtTenantScope(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtTenantScopeOperation> StartCreateOrUpdateAtTenantScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteOperation StartDelete(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteOperation> StartDeleteAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtManagementGroupScopeOperation StartDeleteAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtManagementGroupScopeOperation> StartDeleteAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtScopeOperation StartDeleteAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtScopeOperation> StartDeleteAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtSubscriptionScopeOperation StartDeleteAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtSubscriptionScopeOperation> StartDeleteAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtTenantScopeOperation StartDeleteAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtTenantScopeOperation> StartDeleteAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsValidateOperation StartValidate(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateOperation> StartValidateAsync(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtManagementGroupScopeOperation StartValidateAtManagementGroupScope(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtManagementGroupScopeOperation> StartValidateAtManagementGroupScopeAsync(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtScopeOperation StartValidateAtScope(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtScopeOperation> StartValidateAtScopeAsync(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtSubscriptionScopeOperation StartValidateAtSubscriptionScope(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtSubscriptionScopeOperation> StartValidateAtSubscriptionScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtTenantScopeOperation StartValidateAtTenantScope(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtTenantScopeOperation> StartValidateAtTenantScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsWhatIfOperation StartWhatIf(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsWhatIfOperation> StartWhatIfAsync(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsWhatIfAtSubscriptionScopeOperation StartWhatIfAtSubscriptionScope(string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsWhatIfAtSubscriptionScopeOperation> StartWhatIfAtSubscriptionScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DeploymentsCreateOrUpdateAtManagementGroupScopeOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.DeploymentExtended>
     {
         internal DeploymentsCreateOrUpdateAtManagementGroupScopeOperation() { }
@@ -331,9 +241,22 @@ internal DeploymentsCreateOrUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DeploymentScriptsClient
+    public partial class DeploymentScriptsCreateOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.DeploymentScript>
     {
-        protected DeploymentScriptsClient() { }
+        internal DeploymentScriptsCreateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Resources.Models.DeploymentScript Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class DeploymentScriptsOperations
+    {
+        protected DeploymentScriptsOperations() { }
         public virtual Azure.Response Delete(string resourceGroupName, string scriptName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> DeleteAsync(string resourceGroupName, string scriptName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript> Get(string resourceGroupName, string scriptName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -351,19 +274,6 @@ protected DeploymentScriptsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript> Update(string resourceGroupName, string scriptName, Azure.ResourceManager.Resources.Models.DeploymentScriptUpdateParameter deploymentScript = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript>> UpdateAsync(string resourceGroupName, string scriptName, Azure.ResourceManager.Resources.Models.DeploymentScriptUpdateParameter deploymentScript = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DeploymentScriptsCreateOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.DeploymentScript>
-    {
-        internal DeploymentScriptsCreateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Resources.Models.DeploymentScript Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentScript>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DeploymentsDeleteAtManagementGroupScopeOperation : Azure.Operation<Azure.Response>
     {
         internal DeploymentsDeleteAtManagementGroupScopeOperation() { }
@@ -429,6 +339,96 @@ internal DeploymentsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DeploymentsOperations
+    {
+        protected DeploymentsOperations() { }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.TemplateHashResult> CalculateTemplateHash(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.TemplateHashResult>> CalculateTemplateHashAsync(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response Cancel(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CancelAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CancelAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CancelAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CancelAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistence(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistenceAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistenceAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistenceAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistenceAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplate(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult> ExportTemplateAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExportResult>> ExportTemplateAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> Get(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended> GetAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.DeploymentExtended>> GetAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtManagementGroupScope(string groupId, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtManagementGroupScopeAsync(string groupId, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtScope(string scope, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtScopeAsync(string scope, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtSubscriptionScope(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtSubscriptionScopeAsync(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtTenantScope(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListAtTenantScopeAsync(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListByResourceGroup(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.DeploymentExtended> ListByResourceGroupAsync(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtManagementGroupScopeOperation StartCreateOrUpdateAtManagementGroupScope(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtManagementGroupScopeOperation> StartCreateOrUpdateAtManagementGroupScopeAsync(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtScopeOperation StartCreateOrUpdateAtScope(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtScopeOperation> StartCreateOrUpdateAtScopeAsync(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtSubscriptionScopeOperation StartCreateOrUpdateAtSubscriptionScope(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtSubscriptionScopeOperation> StartCreateOrUpdateAtSubscriptionScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtTenantScopeOperation StartCreateOrUpdateAtTenantScope(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsCreateOrUpdateAtTenantScopeOperation> StartCreateOrUpdateAtTenantScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteOperation StartDelete(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteOperation> StartDeleteAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtManagementGroupScopeOperation StartDeleteAtManagementGroupScope(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtManagementGroupScopeOperation> StartDeleteAtManagementGroupScopeAsync(string groupId, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtScopeOperation StartDeleteAtScope(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtScopeOperation> StartDeleteAtScopeAsync(string scope, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtSubscriptionScopeOperation StartDeleteAtSubscriptionScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtSubscriptionScopeOperation> StartDeleteAtSubscriptionScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsDeleteAtTenantScopeOperation StartDeleteAtTenantScope(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsDeleteAtTenantScopeOperation> StartDeleteAtTenantScopeAsync(string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsValidateOperation StartValidate(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateOperation> StartValidateAsync(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtManagementGroupScopeOperation StartValidateAtManagementGroupScope(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtManagementGroupScopeOperation> StartValidateAtManagementGroupScopeAsync(string groupId, string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtScopeOperation StartValidateAtScope(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtScopeOperation> StartValidateAtScopeAsync(string scope, string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtSubscriptionScopeOperation StartValidateAtSubscriptionScope(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtSubscriptionScopeOperation> StartValidateAtSubscriptionScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsValidateAtTenantScopeOperation StartValidateAtTenantScope(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsValidateAtTenantScopeOperation> StartValidateAtTenantScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.ScopedDeployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsWhatIfOperation StartWhatIf(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsWhatIfOperation> StartWhatIfAsync(string resourceGroupName, string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.DeploymentsWhatIfAtSubscriptionScopeOperation StartWhatIfAtSubscriptionScope(string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.DeploymentsWhatIfAtSubscriptionScopeOperation> StartWhatIfAtSubscriptionScopeAsync(string deploymentName, Azure.ResourceManager.Resources.Models.DeploymentWhatIf parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DeploymentsValidateAtManagementGroupScopeOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.DeploymentValidateResult>
     {
         internal DeploymentsValidateAtManagementGroupScopeOperation() { }
@@ -520,9 +520,9 @@ internal DeploymentsWhatIfOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.WhatIfOperationResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.WhatIfOperationResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FeaturesClient
+    public partial class FeaturesOperations
     {
-        protected FeaturesClient() { }
+        protected FeaturesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.FeatureResult> Get(string resourceProviderNamespace, string featureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.FeatureResult>> GetAsync(string resourceProviderNamespace, string featureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.FeatureResult> List(string resourceProviderNamespace, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -534,9 +534,9 @@ protected FeaturesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.FeatureResult> Unregister(string resourceProviderNamespace, string featureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.FeatureResult>> UnregisterAsync(string resourceProviderNamespace, string featureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ManagementLocksClient
+    public partial class ManagementLocksOperations
     {
-        protected ManagementLocksClient() { }
+        protected ManagementLocksOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ManagementLockObject> CreateOrUpdateAtResourceGroupLevel(string resourceGroupName, string lockName, Azure.ResourceManager.Resources.Models.ManagementLockObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ManagementLockObject>> CreateOrUpdateAtResourceGroupLevelAsync(string resourceGroupName, string lockName, Azure.ResourceManager.Resources.Models.ManagementLockObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ManagementLockObject> CreateOrUpdateAtResourceLevel(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string lockName, Azure.ResourceManager.Resources.Models.ManagementLockObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -570,15 +570,15 @@ protected ManagementLocksClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.ManagementLockObject> ListByScope(string scope, string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.ManagementLockObject> ListByScopeAsync(string scope, string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PolicyAssignmentsClient
+    public partial class PolicyAssignmentsOperations
     {
-        protected PolicyAssignmentsClient() { }
+        protected PolicyAssignmentsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.PolicyAssignment> Create(string scope, string policyAssignmentName, Azure.ResourceManager.Resources.Models.PolicyAssignment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.PolicyAssignment>> CreateAsync(string scope, string policyAssignmentName, Azure.ResourceManager.Resources.Models.PolicyAssignment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.PolicyAssignment> CreateById(string policyAssignmentId, Azure.ResourceManager.Resources.Models.PolicyAssignment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -600,9 +600,9 @@ protected PolicyAssignmentsClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.PolicyAssignment> ListForResourceGroup(string resourceGroupName, string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.PolicyAssignment> ListForResourceGroupAsync(string resourceGroupName, string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PolicyDefinitionsClient
+    public partial class PolicyDefinitionsOperations
     {
-        protected PolicyDefinitionsClient() { }
+        protected PolicyDefinitionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.PolicyDefinition> CreateOrUpdate(string policyDefinitionName, Azure.ResourceManager.Resources.Models.PolicyDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.PolicyDefinition>> CreateOrUpdateAsync(string policyDefinitionName, Azure.ResourceManager.Resources.Models.PolicyDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.PolicyDefinition> CreateOrUpdateAtManagementGroup(string policyDefinitionName, string managementGroupId, Azure.ResourceManager.Resources.Models.PolicyDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -624,9 +624,9 @@ protected PolicyDefinitionsClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.PolicyDefinition> ListByManagementGroup(string managementGroupId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.PolicyDefinition> ListByManagementGroupAsync(string managementGroupId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PolicySetDefinitionsClient
+    public partial class PolicySetDefinitionsOperations
     {
-        protected PolicySetDefinitionsClient() { }
+        protected PolicySetDefinitionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.PolicySetDefinition> CreateOrUpdate(string policySetDefinitionName, Azure.ResourceManager.Resources.Models.PolicySetDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.PolicySetDefinition>> CreateOrUpdateAsync(string policySetDefinitionName, Azure.ResourceManager.Resources.Models.PolicySetDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.PolicySetDefinition> CreateOrUpdateAtManagementGroup(string policySetDefinitionName, string managementGroupId, Azure.ResourceManager.Resources.Models.PolicySetDefinition parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -648,9 +648,9 @@ protected PolicySetDefinitionsClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.PolicySetDefinition> ListByManagementGroup(string managementGroupId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.PolicySetDefinition> ListByManagementGroupAsync(string managementGroupId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ProvidersClient
+    public partial class ProvidersOperations
     {
-        protected ProvidersClient() { }
+        protected ProvidersOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Provider> Get(string resourceProviderNamespace, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Provider>> GetAsync(string resourceProviderNamespace, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Provider> GetAtTenantScope(string resourceProviderNamespace, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -664,24 +664,6 @@ protected ProvidersClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Provider> Unregister(string resourceProviderNamespace, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Provider>> UnregisterAsync(string resourceProviderNamespace, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceGroupsClient
-    {
-        protected ResourceGroupsClient() { }
-        public virtual Azure.Response CheckExistence(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup> CreateOrUpdate(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup>> CreateOrUpdateAsync(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup> Get(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup>> GetAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.ResourceGroup> List(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.ResourceGroup> ListAsync(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourceGroupsDeleteOperation StartDelete(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourceGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourceGroupsExportTemplateOperation StartExportTemplate(string resourceGroupName, Azure.ResourceManager.Resources.Models.ExportTemplateRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourceGroupsExportTemplateOperation> StartExportTemplateAsync(string resourceGroupName, Azure.ResourceManager.Resources.Models.ExportTemplateRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup> Update(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroupPatchable parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup>> UpdateAsync(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroupPatchable parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ResourceGroupsDeleteOperation : Azure.Operation<Azure.Response>
     {
         internal ResourceGroupsDeleteOperation() { }
@@ -708,9 +690,27 @@ internal ResourceGroupsExportTemplateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroupExportResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroupExportResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceLinksClient
+    public partial class ResourceGroupsOperations
+    {
+        protected ResourceGroupsOperations() { }
+        public virtual Azure.Response CheckExistence(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup> CreateOrUpdate(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup>> CreateOrUpdateAsync(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup> Get(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup>> GetAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.ResourceGroup> List(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.ResourceGroup> ListAsync(string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourceGroupsDeleteOperation StartDelete(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourceGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourceGroupsExportTemplateOperation StartExportTemplate(string resourceGroupName, Azure.ResourceManager.Resources.Models.ExportTemplateRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourceGroupsExportTemplateOperation> StartExportTemplateAsync(string resourceGroupName, Azure.ResourceManager.Resources.Models.ExportTemplateRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup> Update(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroupPatchable parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceGroup>> UpdateAsync(string resourceGroupName, Azure.ResourceManager.Resources.Models.ResourceGroupPatchable parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ResourceLinksOperations
     {
-        protected ResourceLinksClient() { }
+        protected ResourceLinksOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.ResourceLink> CreateOrUpdate(string linkId, Azure.ResourceManager.Resources.Models.ResourceLink parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.ResourceLink>> CreateOrUpdateAsync(string linkId, Azure.ResourceManager.Resources.Models.ResourceLink parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string linkId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -722,38 +722,6 @@ protected ResourceLinksClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.ResourceLink> ListAtSubscription(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.ResourceLink> ListAtSubscriptionAsync(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourcesClient
-    {
-        protected ResourcesClient() { }
-        public virtual Azure.Response CheckExistence(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistenceById(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceByIdAsync(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource> Get(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource>> GetAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource> GetById(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource>> GetByIdAsync(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> List(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> ListAsync(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> ListByResourceGroup(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> ListByResourceGroupAsync(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesCreateOrUpdateByIdOperation StartCreateOrUpdateById(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesDeleteOperation StartDelete(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesDeleteOperation> StartDeleteAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesDeleteByIdOperation StartDeleteById(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesDeleteByIdOperation> StartDeleteByIdAsync(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesMoveResourcesOperation StartMoveResources(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesMoveResourcesOperation> StartMoveResourcesAsync(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesUpdateOperation StartUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesUpdateOperation> StartUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesUpdateByIdOperation StartUpdateById(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesUpdateByIdOperation> StartUpdateByIdAsync(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesValidateMoveResourcesOperation StartValidateMoveResources(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesValidateMoveResourcesOperation> StartValidateMoveResourcesAsync(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ResourcesCreateOrUpdateByIdOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.GenericResource>
     {
         internal ResourcesCreateOrUpdateByIdOperation() { }
@@ -811,26 +779,26 @@ public partial class ResourcesManagementClient
         protected ResourcesManagementClient() { }
         public ResourcesManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Resources.ResourcesManagementClientOptions options = null) { }
         public ResourcesManagementClient(System.Uri endpoint, string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Resources.ResourcesManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsClient GetApplicationDefinitionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ApplicationsClient GetApplicationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.AuthorizationClient GetAuthorizationClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentClient GetDeploymentClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentsClient GetDeploymentsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.DeploymentScriptsClient GetDeploymentScriptsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.FeaturesClient GetFeaturesClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ManagementLocksClient GetManagementLocksClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.PolicyAssignmentsClient GetPolicyAssignmentsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.PolicyDefinitionsClient GetPolicyDefinitionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.PolicySetDefinitionsClient GetPolicySetDefinitionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ProvidersClient GetProvidersClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourceGroupsClient GetResourceGroupsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourceLinksClient GetResourceLinksClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ResourcesClient GetResourcesClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.ServiceClient GetServiceClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.SubscriptionsClient GetSubscriptionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.TagsClient GetTagsClient() { throw null; }
-        public virtual Azure.ResourceManager.Resources.TenantsClient GetTenantsClient() { throw null; }
+        public virtual Azure.ResourceManager.Resources.ApplicationDefinitionsOperations ApplicationDefinitions { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ApplicationsOperations Applications { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.AuthorizationOperations Authorization { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.DeploymentOperations Deployment { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.DeploymentsOperations Deployments { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.DeploymentScriptsOperations DeploymentScripts { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.FeaturesOperations Features { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ManagementLocksOperations ManagementLocks { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.PolicyAssignmentsOperations PolicyAssignments { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.PolicyDefinitionsOperations PolicyDefinitions { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.PolicySetDefinitionsOperations PolicySetDefinitions { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ProvidersOperations Providers { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ResourceGroupsOperations ResourceGroups { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ResourceLinksOperations ResourceLinks { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ResourcesOperations Resources { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.ServiceOperations Service { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.SubscriptionsOperations Subscriptions { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.TagsOperations Tags { get { throw null; } }
+        public virtual Azure.ResourceManager.Resources.TenantsOperations Tenants { get { throw null; } }
     }
     public partial class ResourcesManagementClientOptions : Azure.Core.ClientOptions
     {
@@ -849,6 +817,38 @@ internal ResourcesMoveResourcesOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ResourcesOperations
+    {
+        protected ResourcesOperations() { }
+        public virtual Azure.Response CheckExistence(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistenceById(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceByIdAsync(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource> Get(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource>> GetAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource> GetById(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.GenericResource>> GetByIdAsync(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> List(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> ListAsync(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> ListByResourceGroup(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.GenericResourceExpanded> ListByResourceGroupAsync(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesCreateOrUpdateByIdOperation StartCreateOrUpdateById(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesDeleteOperation StartDelete(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesDeleteOperation> StartDeleteAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesDeleteByIdOperation StartDeleteById(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesDeleteByIdOperation> StartDeleteByIdAsync(string resourceId, string apiVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesMoveResourcesOperation StartMoveResources(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesMoveResourcesOperation> StartMoveResourcesAsync(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesUpdateOperation StartUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesUpdateOperation> StartUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesUpdateByIdOperation StartUpdateById(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesUpdateByIdOperation> StartUpdateByIdAsync(string resourceId, string apiVersion, Azure.ResourceManager.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.ResourceManager.Resources.ResourcesValidateMoveResourcesOperation StartValidateMoveResources(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.ResourceManager.Resources.ResourcesValidateMoveResourcesOperation> StartValidateMoveResourcesAsync(string sourceResourceGroupName, Azure.ResourceManager.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ResourcesUpdateByIdOperation : Azure.Operation<Azure.ResourceManager.Resources.Models.GenericResource>
     {
         internal ResourcesUpdateByIdOperation() { }
@@ -888,15 +888,15 @@ internal ResourcesValidateMoveResourcesOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceClient
+    public partial class ServiceOperations
     {
-        protected ServiceClient() { }
+        protected ServiceOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.OperationAutoGenerated> ListOperations(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.OperationAutoGenerated> ListOperationsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SubscriptionsClient
+    public partial class SubscriptionsOperations
     {
-        protected SubscriptionsClient() { }
+        protected SubscriptionsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.Subscription> Get(string subscriptionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.Subscription>> GetAsync(string subscriptionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Subscription> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -904,9 +904,9 @@ protected SubscriptionsClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.Location> ListLocations(string subscriptionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.Location> ListLocationsAsync(string subscriptionId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class TagsClient
+    public partial class TagsOperations
     {
-        protected TagsClient() { }
+        protected TagsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.TagDetails> CreateOrUpdate(string tagName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.TagDetails>> CreateOrUpdateAsync(string tagName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.TagsResource> CreateOrUpdateAtScope(string scope, Azure.ResourceManager.Resources.Models.TagsResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -926,9 +926,9 @@ protected TagsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Resources.Models.TagsResource> UpdateAtScope(string scope, Azure.ResourceManager.Resources.Models.TagsPatchResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Resources.Models.TagsResource>> UpdateAtScopeAsync(string scope, Azure.ResourceManager.Resources.Models.TagsPatchResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class TenantsClient
+    public partial class TenantsOperations
     {
-        protected TenantsClient() { }
+        protected TenantsOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Resources.Models.TenantIdDescription> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Resources.Models.TenantIdDescription> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
diff --git a/sdk/storage/Azure.ResourceManager.Storage/api/Azure.ResourceManager.Storage.netstandard2.0.cs b/sdk/storage/Azure.ResourceManager.Storage/api/Azure.ResourceManager.Storage.netstandard2.0.cs
index cc7ae9aa95054..ca46ae636a141 100644
--- a/sdk/storage/Azure.ResourceManager.Storage/api/Azure.ResourceManager.Storage.netstandard2.0.cs
+++ b/sdk/storage/Azure.ResourceManager.Storage/api/Azure.ResourceManager.Storage.netstandard2.0.cs
@@ -1,8 +1,8 @@
 namespace Azure.ResourceManager.Storage
 {
-    public partial class BlobContainersClient
+    public partial class BlobContainersOperations
     {
-        protected BlobContainersClient() { }
+        protected BlobContainersOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.LegalHold> ClearLegalHold(string resourceGroupName, string accountName, string containerName, Azure.ResourceManager.Storage.Models.LegalHold legalHold, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.LegalHold>> ClearLegalHoldAsync(string resourceGroupName, string accountName, string containerName, Azure.ResourceManager.Storage.Models.LegalHold legalHold, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.BlobContainer> Create(string resourceGroupName, string accountName, string containerName, Azure.ResourceManager.Storage.Models.BlobContainer blobContainer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -30,9 +30,9 @@ protected BlobContainersClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.BlobContainer> Update(string resourceGroupName, string accountName, string containerName, Azure.ResourceManager.Storage.Models.BlobContainer blobContainer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.BlobContainer>> UpdateAsync(string resourceGroupName, string accountName, string containerName, Azure.ResourceManager.Storage.Models.BlobContainer blobContainer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class BlobServicesClient
+    public partial class BlobServicesOperations
     {
-        protected BlobServicesClient() { }
+        protected BlobServicesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.BlobServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.BlobServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Storage.Models.BlobServiceProperties> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -40,9 +40,9 @@ protected BlobServicesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.BlobServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.BlobServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.BlobServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.BlobServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class EncryptionScopesClient
+    public partial class EncryptionScopesOperations
     {
-        protected EncryptionScopesClient() { }
+        protected EncryptionScopesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.EncryptionScope> Get(string resourceGroupName, string accountName, string encryptionScopeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.EncryptionScope>> GetAsync(string resourceGroupName, string accountName, string encryptionScopeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.ResourceManager.Storage.Models.EncryptionScope> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -52,9 +52,9 @@ protected EncryptionScopesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.EncryptionScope> Put(string resourceGroupName, string accountName, string encryptionScopeName, Azure.ResourceManager.Storage.Models.EncryptionScope encryptionScope, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.EncryptionScope>> PutAsync(string resourceGroupName, string accountName, string encryptionScopeName, Azure.ResourceManager.Storage.Models.EncryptionScope encryptionScope, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FileServicesClient
+    public partial class FileServicesOperations
     {
-        protected FileServicesClient() { }
+        protected FileServicesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.FileServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.FileServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.FileServiceItems> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -62,9 +62,9 @@ protected FileServicesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.FileServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.FileServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.FileServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.FileServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FileSharesClient
+    public partial class FileSharesOperations
     {
-        protected FileSharesClient() { }
+        protected FileSharesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.FileShare> Create(string resourceGroupName, string accountName, string shareName, Azure.ResourceManager.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.FileShare>> CreateAsync(string resourceGroupName, string accountName, string shareName, Azure.ResourceManager.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string shareName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -78,9 +78,9 @@ protected FileSharesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.FileShare> Update(string resourceGroupName, string accountName, string shareName, Azure.ResourceManager.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.FileShare>> UpdateAsync(string resourceGroupName, string accountName, string shareName, Azure.ResourceManager.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ManagementPoliciesClient
+    public partial class ManagementPoliciesOperations
     {
-        protected ManagementPoliciesClient() { }
+        protected ManagementPoliciesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.ManagementPolicy> CreateOrUpdate(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.ManagementPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.ManagementPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.ManagementPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -88,9 +88,9 @@ protected ManagementPoliciesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.ManagementPolicy> Get(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.ManagementPolicy>> GetAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ObjectReplicationPoliciesClient
+    public partial class ObjectReplicationPoliciesOperations
     {
-        protected ObjectReplicationPoliciesClient() { }
+        protected ObjectReplicationPoliciesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.ObjectReplicationPolicy> CreateOrUpdate(string resourceGroupName, string accountName, string objectReplicationPolicyId, Azure.ResourceManager.Storage.Models.ObjectReplicationPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.ObjectReplicationPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, Azure.ResourceManager.Storage.Models.ObjectReplicationPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string objectReplicationPolicyId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -100,15 +100,15 @@ protected ObjectReplicationPoliciesClient() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Storage.Models.ObjectReplicationPolicy> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Storage.Models.ObjectReplicationPolicy> ListAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Storage.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Storage.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointConnectionsClient
+    public partial class PrivateEndpointConnectionsOperations
     {
-        protected PrivateEndpointConnectionsClient() { }
+        protected PrivateEndpointConnectionsOperations() { }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> DeleteAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.PrivateEndpointConnection> Get(string resourceGroupName, string accountName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -118,15 +118,15 @@ protected PrivateEndpointConnectionsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.PrivateEndpointConnection> Put(string resourceGroupName, string accountName, string privateEndpointConnectionName, Azure.ResourceManager.Storage.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.PrivateEndpointConnection>> PutAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, Azure.ResourceManager.Storage.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateLinkResourcesOperations
     {
-        protected PrivateLinkResourcesClient() { }
+        protected PrivateLinkResourcesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.PrivateLinkResourceListResult> ListByStorageAccount(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.PrivateLinkResourceListResult>> ListByStorageAccountAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class QueueClient
+    public partial class QueueOperations
     {
-        protected QueueClient() { }
+        protected QueueOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.StorageQueue> Create(string resourceGroupName, string accountName, string queueName, Azure.ResourceManager.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.StorageQueue>> CreateAsync(string resourceGroupName, string accountName, string queueName, Azure.ResourceManager.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string queueName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -138,9 +138,9 @@ protected QueueClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.StorageQueue> Update(string resourceGroupName, string accountName, string queueName, Azure.ResourceManager.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.StorageQueue>> UpdateAsync(string resourceGroupName, string accountName, string queueName, Azure.ResourceManager.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class QueueServicesClient
+    public partial class QueueServicesOperations
     {
-        protected QueueServicesClient() { }
+        protected QueueServicesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.QueueServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.QueueServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.ListQueueServices> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -148,15 +148,41 @@ protected QueueServicesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.QueueServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.QueueServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.QueueServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.QueueServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SkusClient
+    public partial class SkusOperations
     {
-        protected SkusClient() { }
+        protected SkusOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Storage.Models.SkuInformation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Storage.Models.SkuInformation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class StorageAccountsClient
+    public partial class StorageAccountsCreateOperation : Azure.Operation<Azure.ResourceManager.Storage.Models.StorageAccount>
+    {
+        internal StorageAccountsCreateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.ResourceManager.Storage.Models.StorageAccount Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class StorageAccountsFailoverOperation : Azure.Operation<Azure.Response>
+    {
+        internal StorageAccountsFailoverOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class StorageAccountsOperations
     {
-        protected StorageAccountsClient() { }
+        protected StorageAccountsOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.CheckNameAvailabilityResult> CheckNameAvailability(Azure.ResourceManager.Storage.Models.StorageAccountCheckNameAvailabilityParameters accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(Azure.ResourceManager.Storage.Models.StorageAccountCheckNameAvailabilityParameters accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -186,32 +212,6 @@ protected StorageAccountsClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.StorageAccount> Update(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.StorageAccountUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.StorageAccount>> UpdateAsync(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.StorageAccountUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class StorageAccountsCreateOperation : Azure.Operation<Azure.ResourceManager.Storage.Models.StorageAccount>
-    {
-        internal StorageAccountsCreateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.ResourceManager.Storage.Models.StorageAccount Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.ResourceManager.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class StorageAccountsFailoverOperation : Azure.Operation<Azure.Response>
-    {
-        internal StorageAccountsFailoverOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class StorageAccountsRestoreBlobRangesOperation : Azure.Operation<Azure.ResourceManager.Storage.Models.BlobRestoreStatus>
     {
         internal StorageAccountsRestoreBlobRangesOperation() { }
@@ -230,31 +230,31 @@ public partial class StorageManagementClient
         protected StorageManagementClient() { }
         public StorageManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Storage.StorageManagementClientOptions options = null) { }
         public StorageManagementClient(System.Uri endpoint, string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.ResourceManager.Storage.StorageManagementClientOptions options = null) { }
-        public virtual Azure.ResourceManager.Storage.BlobContainersClient GetBlobContainersClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.BlobServicesClient GetBlobServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.EncryptionScopesClient GetEncryptionScopesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.FileServicesClient GetFileServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.FileSharesClient GetFileSharesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.ManagementPoliciesClient GetManagementPoliciesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.ObjectReplicationPoliciesClient GetObjectReplicationPoliciesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.PrivateLinkResourcesClient GetPrivateLinkResourcesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.QueueClient GetQueueClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.QueueServicesClient GetQueueServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.SkusClient GetSkusClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.StorageAccountsClient GetStorageAccountsClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.TableClient GetTableClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.TableServicesClient GetTableServicesClient() { throw null; }
-        public virtual Azure.ResourceManager.Storage.UsagesClient GetUsagesClient() { throw null; }
+        public virtual Azure.ResourceManager.Storage.BlobContainersOperations BlobContainers { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.BlobServicesOperations BlobServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.EncryptionScopesOperations EncryptionScopes { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.FileServicesOperations FileServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.FileSharesOperations FileShares { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.ManagementPoliciesOperations ManagementPolicies { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.ObjectReplicationPoliciesOperations ObjectReplicationPolicies { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.Operations Operations { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.PrivateEndpointConnectionsOperations PrivateEndpointConnections { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.PrivateLinkResourcesOperations PrivateLinkResources { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.QueueOperations Queue { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.QueueServicesOperations QueueServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.SkusOperations Skus { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.StorageAccountsOperations StorageAccounts { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.TableOperations Table { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.TableServicesOperations TableServices { get { throw null; } }
+        public virtual Azure.ResourceManager.Storage.UsagesOperations Usages { get { throw null; } }
     }
     public partial class StorageManagementClientOptions : Azure.Core.ClientOptions
     {
         public StorageManagementClientOptions() { }
     }
-    public partial class TableClient
+    public partial class TableOperations
     {
-        protected TableClient() { }
+        protected TableOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.Table> Create(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.Table>> CreateAsync(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -266,9 +266,9 @@ protected TableClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.Table> Update(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.Table>> UpdateAsync(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class TableServicesClient
+    public partial class TableServicesOperations
     {
-        protected TableServicesClient() { }
+        protected TableServicesOperations() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.TableServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.TableServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.ListTableServices> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -276,9 +276,9 @@ protected TableServicesClient() { }
         public virtual Azure.Response<Azure.ResourceManager.Storage.Models.TableServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.TableServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.ResourceManager.Storage.Models.TableServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.ResourceManager.Storage.Models.TableServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
-        protected UsagesClient() { }
+        protected UsagesOperations() { }
         public virtual Azure.Pageable<Azure.ResourceManager.Storage.Models.Usage> ListByLocation(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.ResourceManager.Storage.Models.Usage> ListByLocationAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
diff --git a/sdk/testcommon/Azure.Graph.Rbac/api/Azure.Graph.Rbac.netstandard2.0.cs b/sdk/testcommon/Azure.Graph.Rbac/api/Azure.Graph.Rbac.netstandard2.0.cs
index 5efb93ec209ce..ef617238346fd 100644
--- a/sdk/testcommon/Azure.Graph.Rbac/api/Azure.Graph.Rbac.netstandard2.0.cs
+++ b/sdk/testcommon/Azure.Graph.Rbac/api/Azure.Graph.Rbac.netstandard2.0.cs
@@ -1,8 +1,8 @@
 namespace Azure.Graph.Rbac
 {
-    public partial class ApplicationsClient
+    public partial class ApplicationsOperations
     {
-        protected ApplicationsClient() { }
+        protected ApplicationsOperations() { }
         public virtual Azure.Response AddOwner(string applicationObjectId, Azure.Graph.Rbac.Models.AddOwnerParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> AddOwnerAsync(string applicationObjectId, Azure.Graph.Rbac.Models.AddOwnerParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.Application> Create(Azure.Graph.Rbac.Models.ApplicationCreateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -32,9 +32,9 @@ protected ApplicationsClient() { }
         public virtual Azure.Response UpdatePasswordCredentials(string applicationObjectId, Azure.Graph.Rbac.Models.PasswordCredentialsUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> UpdatePasswordCredentialsAsync(string applicationObjectId, Azure.Graph.Rbac.Models.PasswordCredentialsUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DeletedApplicationsClient
+    public partial class DeletedApplicationsOperations
     {
-        protected DeletedApplicationsClient() { }
+        protected DeletedApplicationsOperations() { }
         public virtual Azure.Response HardDelete(string applicationObjectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> HardDeleteAsync(string applicationObjectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.Application> List(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -44,17 +44,17 @@ protected DeletedApplicationsClient() { }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.Application> Restore(string objectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Graph.Rbac.Models.Application>> RestoreAsync(string objectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DomainsClient
+    public partial class DomainsOperations
     {
-        protected DomainsClient() { }
+        protected DomainsOperations() { }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.Domain> Get(string domainName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Graph.Rbac.Models.Domain>> GetAsync(string domainName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.Domain> List(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Graph.Rbac.Models.Domain> ListAsync(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GroupsClient
+    public partial class GroupsOperations
     {
-        protected GroupsClient() { }
+        protected GroupsOperations() { }
         public virtual Azure.Response AddMember(string groupObjectId, Azure.Graph.Rbac.Models.GroupAddMemberParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> AddMemberAsync(string groupObjectId, Azure.Graph.Rbac.Models.GroupAddMemberParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response AddOwner(string objectId, Azure.Graph.Rbac.Models.AddOwnerParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -84,9 +84,9 @@ protected GroupsClient() { }
         public virtual Azure.Response RemoveOwner(string objectId, string ownerObjectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> RemoveOwnerAsync(string objectId, string ownerObjectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OAuth2PermissionGrantClient
+    public partial class OAuth2PermissionGrantOperations
     {
-        protected OAuth2PermissionGrantClient() { }
+        protected OAuth2PermissionGrantOperations() { }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.OAuth2PermissionGrant> Create(Azure.Graph.Rbac.Models.OAuth2PermissionGrant body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Graph.Rbac.Models.OAuth2PermissionGrant>> CreateAsync(Azure.Graph.Rbac.Models.OAuth2PermissionGrant body = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string objectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -96,9 +96,9 @@ protected OAuth2PermissionGrantClient() { }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.OAuth2PermissionGrant> ListNext(string nextLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Graph.Rbac.Models.OAuth2PermissionGrant> ListNextAsync(string nextLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ObjectsClient
+    public partial class ObjectsOperations
     {
-        protected ObjectsClient() { }
+        protected ObjectsOperations() { }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.DirectoryObject> GetObjectsByObjectIds(Azure.Graph.Rbac.Models.GetObjectsParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Graph.Rbac.Models.DirectoryObject> GetObjectsByObjectIdsAsync(Azure.Graph.Rbac.Models.GetObjectsParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.DirectoryObject> GetObjectsByObjectIdsNext(string nextLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -109,23 +109,23 @@ public partial class RbacManagementClient
         protected RbacManagementClient() { }
         public RbacManagementClient(string tenantID, Azure.Core.TokenCredential tokenCredential, Azure.Graph.Rbac.RbacManagementClientOptions options = null) { }
         public RbacManagementClient(string tenantID, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.Graph.Rbac.RbacManagementClientOptions options = null) { }
-        public virtual Azure.Graph.Rbac.ApplicationsClient GetApplicationsClient() { throw null; }
-        public virtual Azure.Graph.Rbac.DeletedApplicationsClient GetDeletedApplicationsClient() { throw null; }
-        public virtual Azure.Graph.Rbac.DomainsClient GetDomainsClient() { throw null; }
-        public virtual Azure.Graph.Rbac.GroupsClient GetGroupsClient() { throw null; }
-        public virtual Azure.Graph.Rbac.OAuth2PermissionGrantClient GetOAuth2PermissionGrantClient() { throw null; }
-        public virtual Azure.Graph.Rbac.ObjectsClient GetObjectsClient() { throw null; }
-        public virtual Azure.Graph.Rbac.ServicePrincipalsClient GetServicePrincipalsClient() { throw null; }
-        public virtual Azure.Graph.Rbac.SignedInUserClient GetSignedInUserClient() { throw null; }
-        public virtual Azure.Graph.Rbac.UsersClient GetUsersClient() { throw null; }
+        public virtual Azure.Graph.Rbac.ApplicationsOperations Applications { get { throw null; } }
+        public virtual Azure.Graph.Rbac.DeletedApplicationsOperations DeletedApplications { get { throw null; } }
+        public virtual Azure.Graph.Rbac.DomainsOperations Domains { get { throw null; } }
+        public virtual Azure.Graph.Rbac.GroupsOperations Groups { get { throw null; } }
+        public virtual Azure.Graph.Rbac.OAuth2PermissionGrantOperations OAuth2PermissionGrant { get { throw null; } }
+        public virtual Azure.Graph.Rbac.ObjectsOperations Objects { get { throw null; } }
+        public virtual Azure.Graph.Rbac.ServicePrincipalsOperations ServicePrincipals { get { throw null; } }
+        public virtual Azure.Graph.Rbac.SignedInUserOperations SignedInUser { get { throw null; } }
+        public virtual Azure.Graph.Rbac.UsersOperations Users { get { throw null; } }
     }
     public partial class RbacManagementClientOptions : Azure.Core.ClientOptions
     {
         public RbacManagementClientOptions() { }
     }
-    public partial class ServicePrincipalsClient
+    public partial class ServicePrincipalsOperations
     {
-        protected ServicePrincipalsClient() { }
+        protected ServicePrincipalsOperations() { }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.ServicePrincipal> Create(Azure.Graph.Rbac.Models.ServicePrincipalCreateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Graph.Rbac.Models.ServicePrincipal>> CreateAsync(Azure.Graph.Rbac.Models.ServicePrincipalCreateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string objectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -149,9 +149,9 @@ protected ServicePrincipalsClient() { }
         public virtual Azure.Response UpdatePasswordCredentials(string objectId, Azure.Graph.Rbac.Models.PasswordCredentialsUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> UpdatePasswordCredentialsAsync(string objectId, Azure.Graph.Rbac.Models.PasswordCredentialsUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SignedInUserClient
+    public partial class SignedInUserOperations
     {
-        protected SignedInUserClient() { }
+        protected SignedInUserOperations() { }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.User> Get(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Graph.Rbac.Models.User>> GetAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.DirectoryObject> ListOwnedObjects(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -159,9 +159,9 @@ protected SignedInUserClient() { }
         public virtual Azure.Pageable<Azure.Graph.Rbac.Models.DirectoryObject> ListOwnedObjectsNext(string nextLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Graph.Rbac.Models.DirectoryObject> ListOwnedObjectsNextAsync(string nextLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsersClient
+    public partial class UsersOperations
     {
-        protected UsersClient() { }
+        protected UsersOperations() { }
         public virtual Azure.Response<Azure.Graph.Rbac.Models.User> Create(Azure.Graph.Rbac.Models.UserCreateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Graph.Rbac.Models.User>> CreateAsync(Azure.Graph.Rbac.Models.UserCreateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string upnOrObjectId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
diff --git a/sdk/testcommon/Azure.Management.Compute.2019_12/api/Azure.Management.Compute.netstandard2.0.cs b/sdk/testcommon/Azure.Management.Compute.2019_12/api/Azure.Management.Compute.netstandard2.0.cs
index 8c63a50c075dc..4fdc59fdef97f 100644
--- a/sdk/testcommon/Azure.Management.Compute.2019_12/api/Azure.Management.Compute.netstandard2.0.cs
+++ b/sdk/testcommon/Azure.Management.Compute.2019_12/api/Azure.Management.Compute.netstandard2.0.cs
@@ -1,8 +1,8 @@
 namespace Azure.Management.Compute
 {
-    public partial class AvailabilitySetsClient
+    public partial class AvailabilitySetsOperations
     {
-        protected AvailabilitySetsClient() { }
+        protected AvailabilitySetsOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.AvailabilitySet> CreateOrUpdate(string resourceGroupName, string availabilitySetName, Azure.Management.Compute.Models.AvailabilitySet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.AvailabilitySet>> CreateOrUpdateAsync(string resourceGroupName, string availabilitySetName, Azure.Management.Compute.Models.AvailabilitySet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string availabilitySetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -23,55 +23,41 @@ public partial class ComputeManagementClient
         protected ComputeManagementClient() { }
         public ComputeManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.Management.Compute.ComputeManagementClientOptions options = null) { }
         public ComputeManagementClient(System.Uri endpoint, string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.Management.Compute.ComputeManagementClientOptions options = null) { }
-        public virtual Azure.Management.Compute.AvailabilitySetsClient GetAvailabilitySetsClient() { throw null; }
-        public virtual Azure.Management.Compute.ContainerServicesClient GetContainerServicesClient() { throw null; }
-        public virtual Azure.Management.Compute.DedicatedHostGroupsClient GetDedicatedHostGroupsClient() { throw null; }
-        public virtual Azure.Management.Compute.DedicatedHostsClient GetDedicatedHostsClient() { throw null; }
-        public virtual Azure.Management.Compute.DiskEncryptionSetsClient GetDiskEncryptionSetsClient() { throw null; }
-        public virtual Azure.Management.Compute.DisksClient GetDisksClient() { throw null; }
-        public virtual Azure.Management.Compute.GalleriesClient GetGalleriesClient() { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationsClient GetGalleryApplicationsClient() { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationVersionsClient GetGalleryApplicationVersionsClient() { throw null; }
-        public virtual Azure.Management.Compute.GalleryImagesClient GetGalleryImagesClient() { throw null; }
-        public virtual Azure.Management.Compute.GalleryImageVersionsClient GetGalleryImageVersionsClient() { throw null; }
-        public virtual Azure.Management.Compute.ImagesClient GetImagesClient() { throw null; }
-        public virtual Azure.Management.Compute.LogAnalyticsClient GetLogAnalyticsClient() { throw null; }
-        public virtual Azure.Management.Compute.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.Management.Compute.ProximityPlacementGroupsClient GetProximityPlacementGroupsClient() { throw null; }
-        public virtual Azure.Management.Compute.ResourceSkusClient GetResourceSkusClient() { throw null; }
-        public virtual Azure.Management.Compute.SnapshotsClient GetSnapshotsClient() { throw null; }
-        public virtual Azure.Management.Compute.SshPublicKeysClient GetSshPublicKeysClient() { throw null; }
-        public virtual Azure.Management.Compute.UsageClient GetUsageClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineExtensionImagesClient GetVirtualMachineExtensionImagesClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineExtensionsClient GetVirtualMachineExtensionsClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineImagesClient GetVirtualMachineImagesClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineRunCommandsClient GetVirtualMachineRunCommandsClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsClient GetVirtualMachineScaleSetExtensionsClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetRollingUpgradesClient GetVirtualMachineScaleSetRollingUpgradesClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsClient GetVirtualMachineScaleSetsClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetVMExtensionsClient GetVirtualMachineScaleSetVMExtensionsClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetVMsClient GetVirtualMachineScaleSetVMsClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesClient GetVirtualMachinesClient() { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineSizesClient GetVirtualMachineSizesClient() { throw null; }
+        public virtual Azure.Management.Compute.AvailabilitySetsOperations AvailabilitySets { get { throw null; } }
+        public virtual Azure.Management.Compute.ContainerServicesOperations ContainerServices { get { throw null; } }
+        public virtual Azure.Management.Compute.DedicatedHostGroupsOperations DedicatedHostGroups { get { throw null; } }
+        public virtual Azure.Management.Compute.DedicatedHostsOperations DedicatedHosts { get { throw null; } }
+        public virtual Azure.Management.Compute.DiskEncryptionSetsOperations DiskEncryptionSets { get { throw null; } }
+        public virtual Azure.Management.Compute.DisksOperations Disks { get { throw null; } }
+        public virtual Azure.Management.Compute.GalleriesOperations Galleries { get { throw null; } }
+        public virtual Azure.Management.Compute.GalleryApplicationsOperations GalleryApplications { get { throw null; } }
+        public virtual Azure.Management.Compute.GalleryApplicationVersionsOperations GalleryApplicationVersions { get { throw null; } }
+        public virtual Azure.Management.Compute.GalleryImagesOperations GalleryImages { get { throw null; } }
+        public virtual Azure.Management.Compute.GalleryImageVersionsOperations GalleryImageVersions { get { throw null; } }
+        public virtual Azure.Management.Compute.ImagesOperations Images { get { throw null; } }
+        public virtual Azure.Management.Compute.LogAnalyticsOperations LogAnalytics { get { throw null; } }
+        public virtual Azure.Management.Compute.Operations Operations { get { throw null; } }
+        public virtual Azure.Management.Compute.ProximityPlacementGroupsOperations ProximityPlacementGroups { get { throw null; } }
+        public virtual Azure.Management.Compute.ResourceSkusOperations ResourceSkus { get { throw null; } }
+        public virtual Azure.Management.Compute.SnapshotsOperations Snapshots { get { throw null; } }
+        public virtual Azure.Management.Compute.SshPublicKeysOperations SshPublicKeys { get { throw null; } }
+        public virtual Azure.Management.Compute.UsageOperations Usage { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineExtensionImagesOperations VirtualMachineExtensionImages { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineExtensionsOperations VirtualMachineExtensions { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineImagesOperations VirtualMachineImages { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineRunCommandsOperations VirtualMachineRunCommands { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachinesOperations VirtualMachines { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsOperations VirtualMachineScaleSetExtensions { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetRollingUpgradesOperations VirtualMachineScaleSetRollingUpgrades { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsOperations VirtualMachineScaleSets { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetVMExtensionsOperations VirtualMachineScaleSetVMExtensions { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetVMsOperations VirtualMachineScaleSetVMs { get { throw null; } }
+        public virtual Azure.Management.Compute.VirtualMachineSizesOperations VirtualMachineSizes { get { throw null; } }
     }
     public partial class ComputeManagementClientOptions : Azure.Core.ClientOptions
     {
         public ComputeManagementClientOptions() { }
     }
-    public partial class ContainerServicesClient
-    {
-        protected ContainerServicesClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.ContainerService> Get(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.ContainerService>> GetAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.ContainerService> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.ContainerService> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.ContainerService> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.ContainerService> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.ContainerServicesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string containerServiceName, Azure.Management.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ContainerServicesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string containerServiceName, Azure.Management.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.ContainerServicesDeleteOperation StartDelete(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ContainerServicesDeleteOperation> StartDeleteAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ContainerServicesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.ContainerService>
     {
         internal ContainerServicesCreateOrUpdateOperation() { }
@@ -98,9 +84,23 @@ internal ContainerServicesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DedicatedHostGroupsClient
+    public partial class ContainerServicesOperations
     {
-        protected DedicatedHostGroupsClient() { }
+        protected ContainerServicesOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.ContainerService> Get(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.ContainerService>> GetAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.ContainerService> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.ContainerService> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.ContainerService> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.ContainerService> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.ContainerServicesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string containerServiceName, Azure.Management.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ContainerServicesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string containerServiceName, Azure.Management.Compute.Models.ContainerService parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.ContainerServicesDeleteOperation StartDelete(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ContainerServicesDeleteOperation> StartDeleteAsync(string resourceGroupName, string containerServiceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class DedicatedHostGroupsOperations
+    {
+        protected DedicatedHostGroupsOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.DedicatedHostGroup> CreateOrUpdate(string resourceGroupName, string hostGroupName, Azure.Management.Compute.Models.DedicatedHostGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.DedicatedHostGroup>> CreateOrUpdateAsync(string resourceGroupName, string hostGroupName, Azure.Management.Compute.Models.DedicatedHostGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -114,20 +114,6 @@ protected DedicatedHostGroupsClient() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.DedicatedHostGroup> Update(string resourceGroupName, string hostGroupName, Azure.Management.Compute.Models.DedicatedHostGroupUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.DedicatedHostGroup>> UpdateAsync(string resourceGroupName, string hostGroupName, Azure.Management.Compute.Models.DedicatedHostGroupUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DedicatedHostsClient
-    {
-        protected DedicatedHostsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.DedicatedHost> Get(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.DedicatedHost>> GetAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.DedicatedHost> ListByHostGroup(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.DedicatedHost> ListByHostGroupAsync(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DedicatedHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DedicatedHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DedicatedHostsDeleteOperation StartDelete(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DedicatedHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DedicatedHostsUpdateOperation StartUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DedicatedHostsUpdateOperation> StartUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DedicatedHostsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.DedicatedHost>
     {
         internal DedicatedHostsCreateOrUpdateOperation() { }
@@ -154,6 +140,20 @@ internal DedicatedHostsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DedicatedHostsOperations
+    {
+        protected DedicatedHostsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.DedicatedHost> Get(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.DedicatedHost>> GetAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.DedicatedHost> ListByHostGroup(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.DedicatedHost> ListByHostGroupAsync(string resourceGroupName, string hostGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DedicatedHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DedicatedHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DedicatedHostsDeleteOperation StartDelete(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DedicatedHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string hostGroupName, string hostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DedicatedHostsUpdateOperation StartUpdate(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DedicatedHostsUpdateOperation> StartUpdateAsync(string resourceGroupName, string hostGroupName, string hostName, Azure.Management.Compute.Models.DedicatedHostUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DedicatedHostsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.DedicatedHost>
     {
         internal DedicatedHostsUpdateOperation() { }
@@ -167,22 +167,6 @@ internal DedicatedHostsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.DedicatedHost>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.DedicatedHost>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DiskEncryptionSetsClient
-    {
-        protected DiskEncryptionSetsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.DiskEncryptionSet> Get(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.DiskEncryptionSet>> GetAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.DiskEncryptionSet> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.DiskEncryptionSet> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.DiskEncryptionSet> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.DiskEncryptionSet> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DiskEncryptionSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DiskEncryptionSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DiskEncryptionSetsDeleteOperation StartDelete(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DiskEncryptionSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DiskEncryptionSetsUpdateOperation StartUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DiskEncryptionSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DiskEncryptionSetsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.DiskEncryptionSet>
     {
         internal DiskEncryptionSetsCreateOrUpdateOperation() { }
@@ -209,6 +193,22 @@ internal DiskEncryptionSetsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DiskEncryptionSetsOperations
+    {
+        protected DiskEncryptionSetsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.DiskEncryptionSet> Get(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.DiskEncryptionSet>> GetAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.DiskEncryptionSet> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.DiskEncryptionSet> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.DiskEncryptionSet> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.DiskEncryptionSet> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DiskEncryptionSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DiskEncryptionSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSet diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DiskEncryptionSetsDeleteOperation StartDelete(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DiskEncryptionSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskEncryptionSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DiskEncryptionSetsUpdateOperation StartUpdate(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DiskEncryptionSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskEncryptionSetName, Azure.Management.Compute.Models.DiskEncryptionSetUpdate diskEncryptionSet, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DiskEncryptionSetsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.DiskEncryptionSet>
     {
         internal DiskEncryptionSetsUpdateOperation() { }
@@ -222,26 +222,6 @@ internal DiskEncryptionSetsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.DiskEncryptionSet>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.DiskEncryptionSet>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DisksClient
-    {
-        protected DisksClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.Disk> Get(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Disk>> GetAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Disk> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Disk> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Disk> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Disk> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DisksCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskName, Azure.Management.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskName, Azure.Management.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DisksDeleteOperation StartDelete(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DisksGrantAccessOperation StartGrantAccess(string resourceGroupName, string diskName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string diskName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DisksRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.DisksUpdateOperation StartUpdate(string resourceGroupName, string diskName, Azure.Management.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskName, Azure.Management.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DisksCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.Disk>
     {
         internal DisksCreateOrUpdateOperation() { }
@@ -281,6 +261,26 @@ internal DisksGrantAccessOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.AccessUri>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.AccessUri>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class DisksOperations
+    {
+        protected DisksOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.Disk> Get(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Disk>> GetAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Disk> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Disk> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Disk> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Disk> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DisksCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string diskName, Azure.Management.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string diskName, Azure.Management.Compute.Models.Disk disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DisksDeleteOperation StartDelete(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksDeleteOperation> StartDeleteAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DisksGrantAccessOperation StartGrantAccess(string resourceGroupName, string diskName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string diskName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DisksRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string diskName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.DisksUpdateOperation StartUpdate(string resourceGroupName, string diskName, Azure.Management.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.DisksUpdateOperation> StartUpdateAsync(string resourceGroupName, string diskName, Azure.Management.Compute.Models.DiskUpdate disk, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class DisksRevokeAccessOperation : Azure.Operation<Azure.Response>
     {
         internal DisksRevokeAccessOperation() { }
@@ -307,22 +307,6 @@ internal DisksUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Disk>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Disk>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleriesClient
-    {
-        protected GalleriesClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.Gallery> Get(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Gallery>> GetAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Gallery> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Gallery> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Gallery> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Gallery> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleriesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleriesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleriesDeleteOperation StartDelete(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleriesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleriesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleriesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleriesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.Gallery>
     {
         internal GalleriesCreateOrUpdateOperation() { }
@@ -349,6 +333,22 @@ internal GalleriesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleriesOperations
+    {
+        protected GalleriesOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.Gallery> Get(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Gallery>> GetAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Gallery> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Gallery> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Gallery> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Gallery> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleriesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleriesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.Gallery gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleriesDeleteOperation StartDelete(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleriesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleriesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleriesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, Azure.Management.Compute.Models.GalleryUpdate gallery, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleriesUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.Gallery>
     {
         internal GalleriesUpdateOperation() { }
@@ -362,20 +362,6 @@ internal GalleriesUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Gallery>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Gallery>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryApplicationsClient
-    {
-        protected GalleryApplicationsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryApplication> Get(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryApplication>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryApplication> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryApplication> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryApplicationsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryApplication>
     {
         internal GalleryApplicationsCreateOrUpdateOperation() { }
@@ -402,6 +388,20 @@ internal GalleryApplicationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryApplicationsOperations
+    {
+        protected GalleryApplicationsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryApplication> Get(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryApplication>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryApplication> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryApplication> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryApplicationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplication galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryApplicationsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryApplicationsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, Azure.Management.Compute.Models.GalleryApplicationUpdate galleryApplication, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryApplicationsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryApplication>
     {
         internal GalleryApplicationsUpdateOperation() { }
@@ -415,20 +415,6 @@ internal GalleryApplicationsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryApplication>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryApplication>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryApplicationVersionsClient
-    {
-        protected GalleryApplicationVersionsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryApplicationVersion> Get(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryApplicationVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryApplicationVersion> ListByGalleryApplication(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryApplicationVersion> ListByGalleryApplicationAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryApplicationVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryApplicationVersionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryApplicationVersion>
     {
         internal GalleryApplicationVersionsCreateOrUpdateOperation() { }
@@ -455,6 +441,20 @@ internal GalleryApplicationVersionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryApplicationVersionsOperations
+    {
+        protected GalleryApplicationVersionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryApplicationVersion> Get(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryApplicationVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryApplicationVersion> ListByGalleryApplication(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryApplicationVersion> ListByGalleryApplicationAsync(string resourceGroupName, string galleryName, string galleryApplicationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryApplicationVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersion galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryApplicationVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryApplicationVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryApplicationVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryApplicationName, string galleryApplicationVersionName, Azure.Management.Compute.Models.GalleryApplicationVersionUpdate galleryApplicationVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryApplicationVersionsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryApplicationVersion>
     {
         internal GalleryApplicationVersionsUpdateOperation() { }
@@ -468,20 +468,6 @@ internal GalleryApplicationVersionsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryApplicationVersion>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryApplicationVersion>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryImagesClient
-    {
-        protected GalleryImagesClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryImage> Get(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryImage>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryImage> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryImage> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryImagesDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryImagesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryImagesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryImage>
     {
         internal GalleryImagesCreateOrUpdateOperation() { }
@@ -508,6 +494,20 @@ internal GalleryImagesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryImagesOperations
+    {
+        protected GalleryImagesOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryImage> Get(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryImage>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryImage> ListByGallery(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryImage> ListByGalleryAsync(string resourceGroupName, string galleryName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImage galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryImagesDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryImagesUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, Azure.Management.Compute.Models.GalleryImageUpdate galleryImage, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryImagesUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryImage>
     {
         internal GalleryImagesUpdateOperation() { }
@@ -521,20 +521,6 @@ internal GalleryImagesUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryImage>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryImage>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class GalleryImageVersionsClient
-    {
-        protected GalleryImageVersionsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryImageVersion> Get(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryImageVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryImageVersion> ListByGalleryImage(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryImageVersion> ListByGalleryImageAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryImageVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImageVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryImageVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImageVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.GalleryImageVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImageVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class GalleryImageVersionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryImageVersion>
     {
         internal GalleryImageVersionsCreateOrUpdateOperation() { }
@@ -561,6 +547,20 @@ internal GalleryImageVersionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class GalleryImageVersionsOperations
+    {
+        protected GalleryImageVersionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.GalleryImageVersion> Get(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.GalleryImageVersion>> GetAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.GalleryImageVersion> ListByGalleryImage(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.GalleryImageVersion> ListByGalleryImageAsync(string resourceGroupName, string galleryName, string galleryImageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryImageVersionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImageVersionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersion galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryImageVersionsDeleteOperation StartDelete(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImageVersionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.GalleryImageVersionsUpdateOperation StartUpdate(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.GalleryImageVersionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string galleryName, string galleryImageName, string galleryImageVersionName, Azure.Management.Compute.Models.GalleryImageVersionUpdate galleryImageVersion, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class GalleryImageVersionsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.GalleryImageVersion>
     {
         internal GalleryImageVersionsUpdateOperation() { }
@@ -574,22 +574,6 @@ internal GalleryImageVersionsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryImageVersion>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.GalleryImageVersion>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ImagesClient
-    {
-        protected ImagesClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.Image> Get(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Image>> GetAsync(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Image> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Image> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Image> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Image> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.ImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string imageName, Azure.Management.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string imageName, Azure.Management.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.ImagesDeleteOperation StartDelete(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.ImagesUpdateOperation StartUpdate(string resourceGroupName, string imageName, Azure.Management.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string imageName, Azure.Management.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ImagesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.Image>
     {
         internal ImagesCreateOrUpdateOperation() { }
@@ -616,6 +600,22 @@ internal ImagesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ImagesOperations
+    {
+        protected ImagesOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.Image> Get(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Image>> GetAsync(string resourceGroupName, string imageName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Image> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Image> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Image> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Image> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.ImagesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string imageName, Azure.Management.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ImagesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string imageName, Azure.Management.Compute.Models.Image parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.ImagesDeleteOperation StartDelete(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ImagesDeleteOperation> StartDeleteAsync(string resourceGroupName, string imageName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.ImagesUpdateOperation StartUpdate(string resourceGroupName, string imageName, Azure.Management.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.ImagesUpdateOperation> StartUpdateAsync(string resourceGroupName, string imageName, Azure.Management.Compute.Models.ImageUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ImagesUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.Image>
     {
         internal ImagesUpdateOperation() { }
@@ -629,14 +629,6 @@ internal ImagesUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Image>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Image>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LogAnalyticsClient
-    {
-        protected LogAnalyticsClient() { }
-        public virtual Azure.Management.Compute.LogAnalyticsExportRequestRateByIntervalOperation StartExportRequestRateByInterval(string location, Azure.Management.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.LogAnalyticsExportRequestRateByIntervalOperation> StartExportRequestRateByIntervalAsync(string location, Azure.Management.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.LogAnalyticsExportThrottledRequestsOperation StartExportThrottledRequests(string location, Azure.Management.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.LogAnalyticsExportThrottledRequestsOperation> StartExportThrottledRequestsAsync(string location, Azure.Management.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class LogAnalyticsExportRequestRateByIntervalOperation : Azure.Operation<Azure.Management.Compute.Models.LogAnalyticsOperationResult>
     {
         internal LogAnalyticsExportRequestRateByIntervalOperation() { }
@@ -663,15 +655,23 @@ internal LogAnalyticsExportThrottledRequestsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.LogAnalyticsOperationResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.LogAnalyticsOperationResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class LogAnalyticsOperations
+    {
+        protected LogAnalyticsOperations() { }
+        public virtual Azure.Management.Compute.LogAnalyticsExportRequestRateByIntervalOperation StartExportRequestRateByInterval(string location, Azure.Management.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.LogAnalyticsExportRequestRateByIntervalOperation> StartExportRequestRateByIntervalAsync(string location, Azure.Management.Compute.Models.RequestRateByIntervalInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.LogAnalyticsExportThrottledRequestsOperation StartExportThrottledRequests(string location, Azure.Management.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.LogAnalyticsExportThrottledRequestsOperation> StartExportThrottledRequestsAsync(string location, Azure.Management.Compute.Models.LogAnalyticsInputBase parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.Management.Compute.Models.ComputeOperationValue> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.ComputeOperationValue> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ProximityPlacementGroupsClient
+    public partial class ProximityPlacementGroupsOperations
     {
-        protected ProximityPlacementGroupsClient() { }
+        protected ProximityPlacementGroupsOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.ProximityPlacementGroup> CreateOrUpdate(string resourceGroupName, string proximityPlacementGroupName, Azure.Management.Compute.Models.ProximityPlacementGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.ProximityPlacementGroup>> CreateOrUpdateAsync(string resourceGroupName, string proximityPlacementGroupName, Azure.Management.Compute.Models.ProximityPlacementGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string proximityPlacementGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -685,32 +685,12 @@ protected ProximityPlacementGroupsClient() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.ProximityPlacementGroup> Update(string resourceGroupName, string proximityPlacementGroupName, Azure.Management.Compute.Models.UpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.ProximityPlacementGroup>> UpdateAsync(string resourceGroupName, string proximityPlacementGroupName, Azure.Management.Compute.Models.UpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceSkusClient
+    public partial class ResourceSkusOperations
     {
-        protected ResourceSkusClient() { }
+        protected ResourceSkusOperations() { }
         public virtual Azure.Pageable<Azure.Management.Compute.Models.ResourceSku> List(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.ResourceSku> ListAsync(string filter = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SnapshotsClient
-    {
-        protected SnapshotsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.Snapshot> Get(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Snapshot>> GetAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Snapshot> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Snapshot> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.Snapshot> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Snapshot> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.SnapshotsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.SnapshotsDeleteOperation StartDelete(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsDeleteOperation> StartDeleteAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.SnapshotsGrantAccessOperation StartGrantAccess(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.SnapshotsRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.SnapshotsUpdateOperation StartUpdate(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsUpdateOperation> StartUpdateAsync(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class SnapshotsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.Snapshot>
     {
         internal SnapshotsCreateOrUpdateOperation() { }
@@ -750,6 +730,26 @@ internal SnapshotsGrantAccessOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.AccessUri>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.AccessUri>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class SnapshotsOperations
+    {
+        protected SnapshotsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.Snapshot> Get(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.Snapshot>> GetAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Snapshot> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Snapshot> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.Snapshot> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Snapshot> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.SnapshotsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.Snapshot snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.SnapshotsDeleteOperation StartDelete(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsDeleteOperation> StartDeleteAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.SnapshotsGrantAccessOperation StartGrantAccess(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsGrantAccessOperation> StartGrantAccessAsync(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.GrantAccessData grantAccessData, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.SnapshotsRevokeAccessOperation StartRevokeAccess(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsRevokeAccessOperation> StartRevokeAccessAsync(string resourceGroupName, string snapshotName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.SnapshotsUpdateOperation StartUpdate(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.SnapshotsUpdateOperation> StartUpdateAsync(string resourceGroupName, string snapshotName, Azure.Management.Compute.Models.SnapshotUpdate snapshot, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class SnapshotsRevokeAccessOperation : Azure.Operation<Azure.Response>
     {
         internal SnapshotsRevokeAccessOperation() { }
@@ -776,9 +776,9 @@ internal SnapshotsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Snapshot>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.Snapshot>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SshPublicKeysClient
+    public partial class SshPublicKeysOperations
     {
-        protected SshPublicKeysClient() { }
+        protected SshPublicKeysOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.SshPublicKeyResource> Create(string resourceGroupName, string sshPublicKeyName, Azure.Management.Compute.Models.SshPublicKeyResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.SshPublicKeyResource>> CreateAsync(string resourceGroupName, string sshPublicKeyName, Azure.Management.Compute.Models.SshPublicKeyResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string sshPublicKeyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -794,15 +794,15 @@ protected SshPublicKeysClient() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.SshPublicKeyResource> Update(string resourceGroupName, string sshPublicKeyName, Azure.Management.Compute.Models.SshPublicKeyUpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.SshPublicKeyResource>> UpdateAsync(string resourceGroupName, string sshPublicKeyName, Azure.Management.Compute.Models.SshPublicKeyUpdateResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsageClient
+    public partial class UsageOperations
     {
-        protected UsageClient() { }
+        protected UsageOperations() { }
         public virtual Azure.Pageable<Azure.Management.Compute.Models.Usage> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.Usage> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineExtensionImagesClient
+    public partial class VirtualMachineExtensionImagesOperations
     {
-        protected VirtualMachineExtensionImagesClient() { }
+        protected VirtualMachineExtensionImagesOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionImage> Get(string location, string publisherName, string type, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionImage>> GetAsync(string location, string publisherName, string type, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.Management.Compute.Models.VirtualMachineExtensionImage>> ListTypes(string location, string publisherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -810,20 +810,6 @@ protected VirtualMachineExtensionImagesClient() { }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.Management.Compute.Models.VirtualMachineExtensionImage>> ListVersions(string location, string publisherName, string type, string filter = null, int? top = default(int?), string orderby = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.Management.Compute.Models.VirtualMachineExtensionImage>>> ListVersionsAsync(string location, string publisherName, string type, string filter = null, int? top = default(int?), string orderby = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineExtensionsClient
-    {
-        protected VirtualMachineExtensionsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension> Get(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineExtension>
     {
         internal VirtualMachineExtensionsCreateOrUpdateOperation() { }
@@ -850,6 +836,20 @@ internal VirtualMachineExtensionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachineExtensionsOperations
+    {
+        protected VirtualMachineExtensionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension> Get(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmName, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionsListResult>> ListAsync(string resourceGroupName, string vmName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, string vmExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachineExtensionsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineExtension>
     {
         internal VirtualMachineExtensionsUpdateOperation() { }
@@ -863,9 +863,9 @@ internal VirtualMachineExtensionsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineImagesClient
+    public partial class VirtualMachineImagesOperations
     {
-        protected VirtualMachineImagesClient() { }
+        protected VirtualMachineImagesOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineImage> Get(string location, string publisherName, string offer, string skus, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineImage>> GetAsync(string location, string publisherName, string offer, string skus, string version, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.Management.Compute.Models.VirtualMachineImageResource>> List(string location, string publisherName, string offer, string skus, string expand = null, int? top = default(int?), string orderby = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -877,28 +877,14 @@ protected VirtualMachineImagesClient() { }
         public virtual Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.Management.Compute.Models.VirtualMachineImageResource>> ListSkus(string location, string publisherName, string offer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<System.Collections.Generic.IReadOnlyList<Azure.Management.Compute.Models.VirtualMachineImageResource>>> ListSkusAsync(string location, string publisherName, string offer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineRunCommandsClient
+    public partial class VirtualMachineRunCommandsOperations
     {
-        protected VirtualMachineRunCommandsClient() { }
+        protected VirtualMachineRunCommandsOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.RunCommandDocument> Get(string location, string commandId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.RunCommandDocument>> GetAsync(string location, string commandId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Compute.Models.RunCommandDocumentBase> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.RunCommandDocumentBase> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetExtensionsClient
-    {
-        protected VirtualMachineScaleSetExtensionsClient() { }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension> Get(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension> List(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension> ListAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineScaleSetExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension>
     {
         internal VirtualMachineScaleSetExtensionsCreateOrUpdateOperation() { }
@@ -925,6 +911,20 @@ internal VirtualMachineScaleSetExtensionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachineScaleSetExtensionsOperations
+    {
+        protected VirtualMachineScaleSetExtensionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension> Get(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension> List(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension> ListAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetExtensionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtension extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetExtensionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string vmssExtensionName, Azure.Management.Compute.Models.VirtualMachineScaleSetExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachineScaleSetExtensionsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineScaleSetExtension>
     {
         internal VirtualMachineScaleSetExtensionsUpdateOperation() { }
@@ -951,9 +951,9 @@ internal VirtualMachineScaleSetRollingUpgradesCancelOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetRollingUpgradesClient
+    public partial class VirtualMachineScaleSetRollingUpgradesOperations
     {
-        protected VirtualMachineScaleSetRollingUpgradesClient() { }
+        protected VirtualMachineScaleSetRollingUpgradesOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.RollingUpgradeStatusInfo> GetLatest(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.RollingUpgradeStatusInfo>> GetLatestAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Management.Compute.VirtualMachineScaleSetRollingUpgradesCancelOperation StartCancel(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -989,54 +989,6 @@ internal VirtualMachineScaleSetRollingUpgradesStartOSUpgradeOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetsClient
-    {
-        protected VirtualMachineScaleSetsClient() { }
-        public virtual Azure.Response ConvertToSinglePlacementGroup(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> ConvertToSinglePlacementGroupAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Compute.Models.RecoveryWalkResponse> ForceRecoveryServiceFabricPlatformUpdateDomainWalk(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.RecoveryWalkResponse>> ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSet> Get(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSet>> GetAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistory(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistoryAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSetSku> ListSkus(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSetSku> ListSkusAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsDeallocateOperation StartDeallocate(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsDeleteInstancesOperation StartDeleteInstances(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsDeleteInstancesOperation> StartDeleteInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsPowerOffOperation StartPowerOff(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsRedeployOperation StartRedeploy(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsReimageOperation StartReimage(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsReimageAllOperation StartReimageAll(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsReimageAllOperation> StartReimageAllAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsReimageOperation> StartReimageAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsRestartOperation StartRestart(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsRestartOperation> StartRestartAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation StartSetOrchestrationServiceState(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation> StartSetOrchestrationServiceStateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsStartOperation StartStart(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsStartOperation> StartStartAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachineScaleSetsUpdateInstancesOperation StartUpdateInstances(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsUpdateInstancesOperation> StartUpdateInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineScaleSetsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineScaleSet>
     {
         internal VirtualMachineScaleSetsCreateOrUpdateOperation() { }
@@ -1089,6 +1041,54 @@ internal VirtualMachineScaleSetsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachineScaleSetsOperations
+    {
+        protected VirtualMachineScaleSetsOperations() { }
+        public virtual Azure.Response ConvertToSinglePlacementGroup(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> ConvertToSinglePlacementGroupAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VMScaleSetConvertToSinglePlacementGroupInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Compute.Models.RecoveryWalkResponse> ForceRecoveryServiceFabricPlatformUpdateDomainWalk(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.RecoveryWalkResponse>> ForceRecoveryServiceFabricPlatformUpdateDomainWalkAsync(string resourceGroupName, string vmScaleSetName, int platformUpdateDomain, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSet> Get(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSet>> GetAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetInstanceView>> GetInstanceViewAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistory(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.UpgradeOperationHistoricalStatusInfo> GetOSUpgradeHistoryAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSet> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineScaleSetSku> ListSkus(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineScaleSetSku> ListSkusAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSet parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsDeallocateOperation StartDeallocate(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsDeleteOperation StartDelete(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsDeleteInstancesOperation StartDeleteInstances(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsDeleteInstancesOperation> StartDeleteInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsPowerOffOperation StartPowerOff(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmScaleSetName, bool? skipShutdown = default(bool?), Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsRedeployOperation StartRedeploy(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsReimageOperation StartReimage(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsReimageAllOperation StartReimageAll(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsReimageAllOperation> StartReimageAllAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsReimageOperation> StartReimageAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetReimageParameters vmScaleSetReimageInput = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsRestartOperation StartRestart(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsRestartOperation> StartRestartAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation StartSetOrchestrationServiceState(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsSetOrchestrationServiceStateOperation> StartSetOrchestrationServiceStateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.OrchestrationServiceStateInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsStartOperation StartStart(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsStartOperation> StartStartAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceIDs vmInstanceIDs = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachineScaleSetsUpdateInstancesOperation StartUpdateInstances(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetsUpdateInstancesOperation> StartUpdateInstancesAsync(string resourceGroupName, string vmScaleSetName, Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceRequiredIDs vmInstanceIDs, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachineScaleSetsPerformMaintenanceOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachineScaleSetsPerformMaintenanceOperation() { }
@@ -1219,9 +1219,35 @@ internal VirtualMachineScaleSetsUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSet>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSet>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsClient
+    public partial class VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineExtension>
+    {
+        internal VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Compute.Models.VirtualMachineExtension Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualMachineScaleSetVMExtensionsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal VirtualMachineScaleSetVMExtensionsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualMachineScaleSetVMExtensionsOperations
     {
-        protected VirtualMachineScaleSetVMExtensionsClient() { }
+        protected VirtualMachineScaleSetVMExtensionsOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension> Get(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtensionsListResult> List(string resourceGroupName, string vmScaleSetName, string instanceId, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1233,9 +1259,9 @@ protected VirtualMachineScaleSetVMExtensionsClient() { }
         public virtual Azure.Management.Compute.VirtualMachineScaleSetVMExtensionsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetVMExtensionsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string instanceId, string vmExtensionName, Azure.Management.Compute.Models.VirtualMachineExtensionUpdate extensionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineExtension>
+    public partial class VirtualMachineScaleSetVMExtensionsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineExtension>
     {
-        internal VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation() { }
+        internal VirtualMachineScaleSetVMExtensionsUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1246,9 +1272,9 @@ internal VirtualMachineScaleSetVMExtensionsCreateOrUpdateOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualMachineScaleSetVMsDeallocateOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualMachineScaleSetVMExtensionsDeleteOperation() { }
+        internal VirtualMachineScaleSetVMsDeallocateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1259,22 +1285,22 @@ internal VirtualMachineScaleSetVMExtensionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMExtensionsUpdateOperation : Azure.Operation<Azure.Management.Compute.Models.VirtualMachineExtension>
+    public partial class VirtualMachineScaleSetVMsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualMachineScaleSetVMExtensionsUpdateOperation() { }
+        internal VirtualMachineScaleSetVMsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Compute.Models.VirtualMachineExtension Value { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineExtension>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMsClient
+    public partial class VirtualMachineScaleSetVMsOperations
     {
-        protected VirtualMachineScaleSetVMsClient() { }
+        protected VirtualMachineScaleSetVMsOperations() { }
         public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetVM> Get(string resourceGroupName, string vmScaleSetName, string instanceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetVM>> GetAsync(string resourceGroupName, string vmScaleSetName, string instanceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineScaleSetVMInstanceView> GetInstanceView(string resourceGroupName, string vmScaleSetName, string instanceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1306,32 +1332,6 @@ protected VirtualMachineScaleSetVMsClient() { }
         public virtual Azure.Management.Compute.VirtualMachineScaleSetVMsUpdateOperation StartUpdate(string resourceGroupName, string vmScaleSetName, string instanceId, Azure.Management.Compute.Models.VirtualMachineScaleSetVM parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachineScaleSetVMsUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmScaleSetName, string instanceId, Azure.Management.Compute.Models.VirtualMachineScaleSetVM parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineScaleSetVMsDeallocateOperation : Azure.Operation<Azure.Response>
-    {
-        internal VirtualMachineScaleSetVMsDeallocateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VirtualMachineScaleSetVMsDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal VirtualMachineScaleSetVMsDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachineScaleSetVMsPerformMaintenanceOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachineScaleSetVMsPerformMaintenanceOperation() { }
@@ -1462,54 +1462,6 @@ internal VirtualMachinesCaptureOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineCaptureResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Compute.Models.VirtualMachineCaptureResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachinesClient
-    {
-        protected VirtualMachinesClient() { }
-        public virtual Azure.Response Generalize(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> GeneralizeAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachine> Get(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachine>> GetAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineInstanceView> InstanceView(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineInstanceView>> InstanceViewAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachine> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachine> ListAll(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachine> ListAllAsync(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachine> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineSize> ListAvailableSizes(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineSize> ListAvailableSizesAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachine> ListByLocation(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachine> ListByLocationAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response SimulateEviction(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> SimulateEvictionAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesCaptureOperation StartCapture(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesCaptureOperation> StartCaptureAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesConvertToManagedDisksOperation StartConvertToManagedDisks(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesConvertToManagedDisksOperation> StartConvertToManagedDisksAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesDeallocateOperation StartDeallocate(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesDeleteOperation StartDelete(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesPowerOffOperation StartPowerOff(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesReapplyOperation StartReapply(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesReapplyOperation> StartReapplyAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesRedeployOperation StartRedeploy(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesReimageOperation StartReimage(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesReimageOperation> StartReimageAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesRestartOperation StartRestart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesRestartOperation> StartRestartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesRunCommandOperation StartRunCommand(string resourceGroupName, string vmName, Azure.Management.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesRunCommandOperation> StartRunCommandAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesStartOperation StartStart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesStartOperation> StartStartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Compute.VirtualMachinesUpdateOperation StartUpdate(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualMachinesConvertToManagedDisksOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachinesConvertToManagedDisksOperation() { }
@@ -1562,12 +1514,60 @@ internal VirtualMachinesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualMachineSizesClient
+    public partial class VirtualMachineSizesOperations
     {
-        protected VirtualMachineSizesClient() { }
+        protected VirtualMachineSizesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineSize> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineSize> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualMachinesOperations
+    {
+        protected VirtualMachinesOperations() { }
+        public virtual Azure.Response Generalize(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> GeneralizeAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachine> Get(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachine>> GetAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Compute.Models.VirtualMachineInstanceView> InstanceView(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Compute.Models.VirtualMachineInstanceView>> InstanceViewAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachine> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachine> ListAll(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachine> ListAllAsync(string statusOnly = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachine> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachineSize> ListAvailableSizes(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachineSize> ListAvailableSizesAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Compute.Models.VirtualMachine> ListByLocation(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Compute.Models.VirtualMachine> ListByLocationAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response SimulateEviction(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> SimulateEvictionAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesCaptureOperation StartCapture(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesCaptureOperation> StartCaptureAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineCaptureParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesConvertToManagedDisksOperation StartConvertToManagedDisks(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesConvertToManagedDisksOperation> StartConvertToManagedDisksAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachine parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesDeallocateOperation StartDeallocate(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesDeallocateOperation> StartDeallocateAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesDeleteOperation StartDelete(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesPerformMaintenanceOperation StartPerformMaintenance(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesPerformMaintenanceOperation> StartPerformMaintenanceAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesPowerOffOperation StartPowerOff(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesPowerOffOperation> StartPowerOffAsync(string resourceGroupName, string vmName, bool? skipShutdown = default(bool?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesReapplyOperation StartReapply(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesReapplyOperation> StartReapplyAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesRedeployOperation StartRedeploy(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesRedeployOperation> StartRedeployAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesReimageOperation StartReimage(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesReimageOperation> StartReimageAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineReimageParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesRestartOperation StartRestart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesRestartOperation> StartRestartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesRunCommandOperation StartRunCommand(string resourceGroupName, string vmName, Azure.Management.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesRunCommandOperation> StartRunCommandAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.RunCommandInput parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesStartOperation StartStart(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesStartOperation> StartStartAsync(string resourceGroupName, string vmName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Compute.VirtualMachinesUpdateOperation StartUpdate(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Compute.VirtualMachinesUpdateOperation> StartUpdateAsync(string resourceGroupName, string vmName, Azure.Management.Compute.Models.VirtualMachineUpdate parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualMachinesPerformMaintenanceOperation : Azure.Operation<Azure.Response>
     {
         internal VirtualMachinesPerformMaintenanceOperation() { }
diff --git a/sdk/testcommon/Azure.Management.Network.2020_04/api/Azure.Management.Network.netstandard2.0.cs b/sdk/testcommon/Azure.Management.Network.2020_04/api/Azure.Management.Network.netstandard2.0.cs
index 8b3ddfa598d08..45cc478bc53d3 100644
--- a/sdk/testcommon/Azure.Management.Network.2020_04/api/Azure.Management.Network.netstandard2.0.cs
+++ b/sdk/testcommon/Azure.Management.Network.2020_04/api/Azure.Management.Network.netstandard2.0.cs
@@ -26,9 +26,35 @@ internal ApplicationGatewaysBackendHealthOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ApplicationGatewayBackendHealth>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ApplicationGatewayBackendHealth>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationGatewaysClient
+    public partial class ApplicationGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ApplicationGateway>
+    {
+        internal ApplicationGatewaysCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Network.Models.ApplicationGateway Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ApplicationGatewaysDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal ApplicationGatewaysDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ApplicationGatewaysOperations
     {
-        protected ApplicationGatewaysClient() { }
+        protected ApplicationGatewaysOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.ApplicationGateway> Get(string resourceGroupName, string applicationGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ApplicationGateway>> GetAsync(string resourceGroupName, string applicationGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Network.Models.ApplicationGatewaySslPredefinedPolicy> GetSslPredefinedPolicy(string predefinedPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -64,32 +90,6 @@ protected ApplicationGatewaysClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.ApplicationGateway> UpdateTags(string resourceGroupName, string applicationGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ApplicationGateway>> UpdateTagsAsync(string resourceGroupName, string applicationGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ApplicationGateway>
-    {
-        internal ApplicationGatewaysCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.ApplicationGateway Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ApplicationGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class ApplicationGatewaysDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal ApplicationGatewaysDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ApplicationGatewaysStartOperation : Azure.Operation<Azure.Response>
     {
         internal ApplicationGatewaysStartOperation() { }
@@ -116,22 +116,6 @@ internal ApplicationGatewaysStopOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ApplicationSecurityGroupsClient
-    {
-        protected ApplicationSecurityGroupsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup> Get(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup>> GetAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ApplicationSecurityGroup> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ApplicationSecurityGroup> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ApplicationSecurityGroup> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ApplicationSecurityGroup> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ApplicationSecurityGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ApplicationSecurityGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ApplicationSecurityGroupsDeleteOperation StartDelete(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ApplicationSecurityGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup> UpdateTags(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ApplicationSecurityGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ApplicationSecurityGroup>
     {
         internal ApplicationSecurityGroupsCreateOrUpdateOperation() { }
@@ -158,62 +142,62 @@ internal ApplicationSecurityGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableDelegationsClient
+    public partial class ApplicationSecurityGroupsOperations
+    {
+        protected ApplicationSecurityGroupsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup> Get(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup>> GetAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ApplicationSecurityGroup> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ApplicationSecurityGroup> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ApplicationSecurityGroup> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ApplicationSecurityGroup> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ApplicationSecurityGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ApplicationSecurityGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.ApplicationSecurityGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ApplicationSecurityGroupsDeleteOperation StartDelete(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ApplicationSecurityGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string applicationSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup> UpdateTags(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ApplicationSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string applicationSecurityGroupName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class AvailableDelegationsOperations
     {
-        protected AvailableDelegationsClient() { }
+        protected AvailableDelegationsOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AvailableDelegation> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AvailableDelegation> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableEndpointServicesClient
+    public partial class AvailableEndpointServicesOperations
     {
-        protected AvailableEndpointServicesClient() { }
+        protected AvailableEndpointServicesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.EndpointServiceResult> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.EndpointServiceResult> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailablePrivateEndpointTypesClient
+    public partial class AvailablePrivateEndpointTypesOperations
     {
-        protected AvailablePrivateEndpointTypesClient() { }
+        protected AvailablePrivateEndpointTypesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AvailablePrivateEndpointType> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AvailablePrivateEndpointType> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AvailablePrivateEndpointType> ListByResourceGroup(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AvailablePrivateEndpointType> ListByResourceGroupAsync(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableResourceGroupDelegationsClient
+    public partial class AvailableResourceGroupDelegationsOperations
     {
-        protected AvailableResourceGroupDelegationsClient() { }
+        protected AvailableResourceGroupDelegationsOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AvailableDelegation> List(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AvailableDelegation> ListAsync(string location, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AvailableServiceAliasesClient
+    public partial class AvailableServiceAliasesOperations
     {
-        protected AvailableServiceAliasesClient() { }
+        protected AvailableServiceAliasesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AvailableServiceAlias> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AvailableServiceAlias> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AvailableServiceAlias> ListByResourceGroup(string resourceGroupName, string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AvailableServiceAlias> ListByResourceGroupAsync(string resourceGroupName, string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AzureFirewallFqdnTagsClient
+    public partial class AzureFirewallFqdnTagsOperations
     {
-        protected AzureFirewallFqdnTagsClient() { }
+        protected AzureFirewallFqdnTagsOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.AzureFirewallFqdnTag> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AzureFirewallFqdnTag> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class AzureFirewallsClient
-    {
-        protected AzureFirewallsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.AzureFirewall> Get(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.AzureFirewall>> GetAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.AzureFirewall> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.AzureFirewall> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AzureFirewall> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AzureFirewall> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.AzureFirewallsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.AzureFirewallsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.AzureFirewallsDeleteOperation StartDelete(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.AzureFirewallsDeleteOperation> StartDeleteAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.AzureFirewallsUpdateTagsOperation StartUpdateTags(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.AzureFirewallsUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class AzureFirewallsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.AzureFirewall>
     {
         internal AzureFirewallsCreateOrUpdateOperation() { }
@@ -240,6 +224,22 @@ internal AzureFirewallsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class AzureFirewallsOperations
+    {
+        protected AzureFirewallsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.AzureFirewall> Get(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.AzureFirewall>> GetAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.AzureFirewall> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.AzureFirewall> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AzureFirewall> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.AzureFirewall> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.AzureFirewallsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.AzureFirewallsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.AzureFirewall parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.AzureFirewallsDeleteOperation StartDelete(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.AzureFirewallsDeleteOperation> StartDeleteAsync(string resourceGroupName, string azureFirewallName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.AzureFirewallsUpdateTagsOperation StartUpdateTags(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.AzureFirewallsUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string azureFirewallName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class AzureFirewallsUpdateTagsOperation : Azure.Operation<Azure.Management.Network.Models.AzureFirewall>
     {
         internal AzureFirewallsUpdateTagsOperation() { }
@@ -253,20 +253,6 @@ internal AzureFirewallsUpdateTagsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.AzureFirewall>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.AzureFirewall>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class BastionHostsClient
-    {
-        protected BastionHostsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.BastionHost> Get(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.BastionHost>> GetAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionHost> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionHost> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionHost> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionHost> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.BastionHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.BastionHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.BastionHostsDeleteOperation StartDelete(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.BastionHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class BastionHostsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.BastionHost>
     {
         internal BastionHostsCreateOrUpdateOperation() { }
@@ -293,31 +279,25 @@ internal BastionHostsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class BgpServiceCommunitiesClient
+    public partial class BastionHostsOperations
     {
-        protected BgpServiceCommunitiesClient() { }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.BgpServiceCommunity> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BgpServiceCommunity> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected BastionHostsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.BastionHost> Get(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.BastionHost>> GetAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionHost> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionHost> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionHost> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionHost> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.BastionHostsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.BastionHostsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionHost parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.BastionHostsDeleteOperation StartDelete(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.BastionHostsDeleteOperation> StartDeleteAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ConnectionMonitorsClient
+    public partial class BgpServiceCommunitiesOperations
     {
-        protected ConnectionMonitorsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult> Get(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult>> GetAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ConnectionMonitorResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ConnectionMonitorResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ConnectionMonitorsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ConnectionMonitorsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ConnectionMonitorsQueryOperation StartQuery(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsQueryOperation> StartQueryAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ConnectionMonitorsStartOperation StartStart(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsStartOperation> StartStartAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ConnectionMonitorsStopOperation StartStop(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult> UpdateTags(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected BgpServiceCommunitiesOperations() { }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.BgpServiceCommunity> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BgpServiceCommunity> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ConnectionMonitorsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ConnectionMonitorResult>
     {
@@ -345,6 +325,26 @@ internal ConnectionMonitorsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ConnectionMonitorsOperations
+    {
+        protected ConnectionMonitorsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult> Get(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult>> GetAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ConnectionMonitorResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ConnectionMonitorResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ConnectionMonitorsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.ConnectionMonitor parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ConnectionMonitorsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ConnectionMonitorsQueryOperation StartQuery(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsQueryOperation> StartQueryAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ConnectionMonitorsStartOperation StartStart(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsStartOperation> StartStartAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ConnectionMonitorsStopOperation StartStop(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ConnectionMonitorsStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult> UpdateTags(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ConnectionMonitorResult>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, string connectionMonitorName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ConnectionMonitorsQueryOperation : Azure.Operation<Azure.Management.Network.Models.ConnectionMonitorQueryResult>
     {
         internal ConnectionMonitorsQueryOperation() { }
@@ -384,18 +384,6 @@ internal ConnectionMonitorsStopOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DdosCustomPoliciesClient
-    {
-        protected DdosCustomPoliciesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy> Get(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy>> GetAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.DdosCustomPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosCustomPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.DdosCustomPoliciesDeleteOperation StartDelete(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosCustomPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy> UpdateTags(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy>> UpdateTagsAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DdosCustomPoliciesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.DdosCustomPolicy>
     {
         internal DdosCustomPoliciesCreateOrUpdateOperation() { }
@@ -422,21 +410,17 @@ internal DdosCustomPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DdosProtectionPlansClient
+    public partial class DdosCustomPoliciesOperations
     {
-        protected DdosProtectionPlansClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan> Get(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan>> GetAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.DdosProtectionPlan> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.DdosProtectionPlan> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.DdosProtectionPlan> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.DdosProtectionPlan> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.DdosProtectionPlansCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosProtectionPlansCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.DdosProtectionPlansDeleteOperation StartDelete(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosProtectionPlansDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan> UpdateTags(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan>> UpdateTagsAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected DdosCustomPoliciesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy> Get(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy>> GetAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.DdosCustomPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosCustomPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.DdosCustomPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.DdosCustomPoliciesDeleteOperation StartDelete(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosCustomPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosCustomPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy> UpdateTags(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosCustomPolicy>> UpdateTagsAsync(string resourceGroupName, string ddosCustomPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class DdosProtectionPlansCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.DdosProtectionPlan>
     {
@@ -464,26 +448,30 @@ internal DdosProtectionPlansDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DefaultSecurityRulesClient
+    public partial class DdosProtectionPlansOperations
+    {
+        protected DdosProtectionPlansOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan> Get(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan>> GetAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.DdosProtectionPlan> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.DdosProtectionPlan> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.DdosProtectionPlan> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.DdosProtectionPlan> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.DdosProtectionPlansCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosProtectionPlansCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.DdosProtectionPlan parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.DdosProtectionPlansDeleteOperation StartDelete(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.DdosProtectionPlansDeleteOperation> StartDeleteAsync(string resourceGroupName, string ddosProtectionPlanName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan> UpdateTags(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DdosProtectionPlan>> UpdateTagsAsync(string resourceGroupName, string ddosProtectionPlanName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class DefaultSecurityRulesOperations
     {
-        protected DefaultSecurityRulesClient() { }
+        protected DefaultSecurityRulesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string defaultSecurityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.SecurityRule> List(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.SecurityRule> ListAsync(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitAuthorizationsClient
-    {
-        protected ExpressRouteCircuitAuthorizationsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization> Get(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization>> GetAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string authorizationName, Azure.Management.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string authorizationName, Azure.Management.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitAuthorizationsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitAuthorizationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization>
     {
         internal ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation() { }
@@ -510,17 +498,17 @@ internal ExpressRouteCircuitAuthorizationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitConnectionsClient
+    public partial class ExpressRouteCircuitAuthorizationsOperations
     {
-        protected ExpressRouteCircuitConnectionsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuitConnection> List(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuitConnection> ListAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.Management.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.Management.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitConnectionsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitAuthorizationsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization> Get(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization>> GetAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuitAuthorization> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string authorizationName, Azure.Management.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitAuthorizationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string authorizationName, Azure.Management.Network.Models.ExpressRouteCircuitAuthorization authorizationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitAuthorizationsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitAuthorizationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string authorizationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCircuitConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteCircuitConnection>
     {
@@ -548,17 +536,17 @@ internal ExpressRouteCircuitConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitPeeringsClient
+    public partial class ExpressRouteCircuitConnectionsOperations
     {
-        protected ExpressRouteCircuitPeeringsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitPeering> Get(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitPeering>> GetAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuitPeering> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuitPeering> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, Azure.Management.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, Azure.Management.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitPeeringsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitConnectionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuitConnection> List(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuitConnection> ListAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.Management.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, Azure.Management.Network.Models.ExpressRouteCircuitConnection expressRouteCircuitConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitConnectionsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCircuitPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteCircuitPeering>
     {
@@ -586,31 +574,17 @@ internal ExpressRouteCircuitPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCircuitsClient
+    public partial class ExpressRouteCircuitPeeringsOperations
     {
-        protected ExpressRouteCircuitsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit> Get(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit>> GetAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats> GetPeeringStats(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats>> GetPeeringStatsAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats> GetStats(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats>> GetStatsAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuit> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuit> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuit> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuit> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, Azure.Management.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, Azure.Management.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitsDeleteOperation StartDelete(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitsListArpTableOperation StartListArpTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit> UpdateTags(string resourceGroupName, string circuitName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit>> UpdateTagsAsync(string resourceGroupName, string circuitName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitPeeringsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitPeering> Get(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitPeering>> GetAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuitPeering> List(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuitPeering> ListAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, string peeringName, Azure.Management.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, string peeringName, Azure.Management.Network.Models.ExpressRouteCircuitPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitPeeringsDeleteOperation StartDelete(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCircuitsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteCircuit>
     {
@@ -677,17 +651,31 @@ internal ExpressRouteCircuitsListRoutesTableSummaryOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteConnectionsClient
+    public partial class ExpressRouteCircuitsOperations
     {
-        protected ExpressRouteConnectionsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteConnection> Get(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteConnection>> GetAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteConnectionList> List(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteConnectionList>> ListAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.Management.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.Management.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteConnectionsDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCircuitsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit> Get(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit>> GetAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats> GetPeeringStats(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats>> GetPeeringStatsAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats> GetStats(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuitStats>> GetStatsAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuit> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCircuit> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuit> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCircuit> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string circuitName, Azure.Management.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string circuitName, Azure.Management.Network.Models.ExpressRouteCircuit parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitsDeleteOperation StartDelete(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsDeleteOperation> StartDeleteAsync(string resourceGroupName, string circuitName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitsListArpTableOperation StartListArpTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCircuitsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string circuitName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit> UpdateTags(string resourceGroupName, string circuitName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCircuit>> UpdateTagsAsync(string resourceGroupName, string circuitName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteConnection>
     {
@@ -715,17 +703,17 @@ internal ExpressRouteConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCrossConnectionPeeringsClient
+    public partial class ExpressRouteConnectionsOperations
     {
-        protected ExpressRouteCrossConnectionPeeringsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering> Get(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering>> GetAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering> List(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering> ListAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, string peeringName, Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, string peeringName, Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation StartDelete(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteConnectionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteConnection> Get(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteConnection>> GetAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteConnectionList> List(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteConnectionList>> ListAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.Management.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, Azure.Management.Network.Models.ExpressRouteConnection putExpressRouteConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteConnectionsDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering>
     {
@@ -753,25 +741,17 @@ internal ExpressRouteCrossConnectionPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteCrossConnectionsClient
+    public partial class ExpressRouteCrossConnectionPeeringsOperations
     {
-        protected ExpressRouteCrossConnectionsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection> Get(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection>> GetAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsListArpTableOperation StartListArpTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection> UpdateTags(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection>> UpdateTagsAsync(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCrossConnectionPeeringsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering> Get(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering>> GetAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering> List(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering> ListAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, string peeringName, Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionPeeringsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, string peeringName, Azure.Management.Network.Models.ExpressRouteCrossConnectionPeering peeringParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation StartDelete(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string crossConnectionName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteCrossConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteCrossConnection>
     {
@@ -825,19 +805,25 @@ internal ExpressRouteCrossConnectionsListRoutesTableSummaryOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnectionsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnectionsRoutesTableSummaryListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteGatewaysClient
+    public partial class ExpressRouteCrossConnectionsOperations
     {
-        protected ExpressRouteGatewaysClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteGateway> Get(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteGateway>> GetAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList>> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList> ListBySubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList>> ListBySubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, Azure.Management.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, Azure.Management.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteGatewaysDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteCrossConnectionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection> Get(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection>> GetAsync(string resourceGroupName, string crossConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteCrossConnection> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.ExpressRouteCrossConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsListArpTableOperation StartListArpTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsListArpTableOperation> StartListArpTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableOperation StartListRoutesTable(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableOperation> StartListRoutesTableAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation StartListRoutesTableSummary(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteCrossConnectionsListRoutesTableSummaryOperation> StartListRoutesTableSummaryAsync(string resourceGroupName, string crossConnectionName, string peeringName, string devicePath, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection> UpdateTags(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteCrossConnection>> UpdateTagsAsync(string resourceGroupName, string crossConnectionName, Azure.Management.Network.Models.TagsObject crossConnectionParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ExpressRouteGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRouteGateway>
     {
@@ -865,30 +851,28 @@ internal ExpressRouteGatewaysDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteLinksClient
+    public partial class ExpressRouteGatewaysOperations
     {
-        protected ExpressRouteLinksClient() { }
+        protected ExpressRouteGatewaysOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteGateway> Get(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteGateway>> GetAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList>> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList> ListBySubscription(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteGatewayList>> ListBySubscriptionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRouteGatewayName, Azure.Management.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRouteGatewayName, Azure.Management.Network.Models.ExpressRouteGateway putExpressRouteGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRouteGatewaysDeleteOperation StartDelete(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRouteGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRouteGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ExpressRouteLinksOperations
+    {
+        protected ExpressRouteLinksOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.ExpressRouteLink> Get(string resourceGroupName, string expressRoutePortName, string linkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRouteLink>> GetAsync(string resourceGroupName, string expressRoutePortName, string linkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteLink> List(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteLink> ListAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRoutePortsClient
-    {
-        protected ExpressRoutePortsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRoutePort> Get(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRoutePort>> GetAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRoutePort> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRoutePort> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRoutePort> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRoutePort> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRoutePortsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRoutePortsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ExpressRoutePortsDeleteOperation StartDelete(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRoutePortsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRoutePort> UpdateTags(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRoutePort>> UpdateTagsAsync(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ExpressRoutePortsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ExpressRoutePort>
     {
         internal ExpressRoutePortsCreateOrUpdateOperation() { }
@@ -915,33 +899,35 @@ internal ExpressRoutePortsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRoutePortsLocationsClient
+    public partial class ExpressRoutePortsLocationsOperations
     {
-        protected ExpressRoutePortsLocationsClient() { }
+        protected ExpressRoutePortsLocationsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.ExpressRoutePortsLocation> Get(string locationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRoutePortsLocation>> GetAsync(string locationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRoutePortsLocation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRoutePortsLocation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ExpressRouteServiceProvidersClient
+    public partial class ExpressRoutePortsOperations
     {
-        protected ExpressRouteServiceProvidersClient() { }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteServiceProvider> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteServiceProvider> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRoutePortsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRoutePort> Get(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRoutePort>> GetAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRoutePort> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRoutePort> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRoutePort> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRoutePort> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRoutePortsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRoutePortsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.ExpressRoutePort parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ExpressRoutePortsDeleteOperation StartDelete(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ExpressRoutePortsDeleteOperation> StartDeleteAsync(string resourceGroupName, string expressRoutePortName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ExpressRoutePort> UpdateTags(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ExpressRoutePort>> UpdateTagsAsync(string resourceGroupName, string expressRoutePortName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FirewallPoliciesClient
+    public partial class ExpressRouteServiceProvidersOperations
     {
-        protected FirewallPoliciesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.FirewallPolicy> Get(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FirewallPolicy>> GetAsync(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.FirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.FirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.FirewallPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, Azure.Management.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, Azure.Management.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.FirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ExpressRouteServiceProvidersOperations() { }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ExpressRouteServiceProvider> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ExpressRouteServiceProvider> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class FirewallPoliciesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.FirewallPolicy>
     {
@@ -969,17 +955,19 @@ internal FirewallPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FirewallPolicyRuleGroupsClient
+    public partial class FirewallPoliciesOperations
     {
-        protected FirewallPolicyRuleGroupsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.FirewallPolicyRuleGroup> Get(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FirewallPolicyRuleGroup>> GetAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.FirewallPolicyRuleGroup> List(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FirewallPolicyRuleGroup> ListAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.Management.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.Management.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.FirewallPolicyRuleGroupsDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPolicyRuleGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected FirewallPoliciesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.FirewallPolicy> Get(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FirewallPolicy>> GetAsync(string resourceGroupName, string firewallPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.FirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.FirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.FirewallPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, Azure.Management.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, Azure.Management.Network.Models.FirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.FirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class FirewallPolicyRuleGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.FirewallPolicyRuleGroup>
     {
@@ -1007,17 +995,17 @@ internal FirewallPolicyRuleGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FlowLogsClient
+    public partial class FirewallPolicyRuleGroupsOperations
     {
-        protected FlowLogsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.FlowLog> Get(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FlowLog>> GetAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.FlowLog> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FlowLog> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.FlowLogsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.Management.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FlowLogsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.Management.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.FlowLogsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FlowLogsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected FirewallPolicyRuleGroupsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.FirewallPolicyRuleGroup> Get(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FirewallPolicyRuleGroup>> GetAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.FirewallPolicyRuleGroup> List(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FirewallPolicyRuleGroup> ListAsync(string resourceGroupName, string firewallPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.Management.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPolicyRuleGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, Azure.Management.Network.Models.FirewallPolicyRuleGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.FirewallPolicyRuleGroupsDeleteOperation StartDelete(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FirewallPolicyRuleGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string firewallPolicyName, string ruleGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class FlowLogsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.FlowLog>
     {
@@ -1045,17 +1033,17 @@ internal FlowLogsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class HubRouteTablesClient
+    public partial class FlowLogsOperations
     {
-        protected HubRouteTablesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.HubRouteTable> Get(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.HubRouteTable>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.HubRouteTable> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.HubRouteTable> ListAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.HubRouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualHubName, string routeTableName, Azure.Management.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.HubRouteTablesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualHubName, string routeTableName, Azure.Management.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.HubRouteTablesDeleteOperation StartDelete(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.HubRouteTablesDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected FlowLogsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.FlowLog> Get(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FlowLog>> GetAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.FlowLog> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FlowLog> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.FlowLogsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.Management.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FlowLogsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, string flowLogName, Azure.Management.Network.Models.FlowLog parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.FlowLogsDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.FlowLogsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string flowLogName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class HubRouteTablesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.HubRouteTable>
     {
@@ -1083,26 +1071,26 @@ internal HubRouteTablesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class HubVirtualNetworkConnectionsClient
+    public partial class HubRouteTablesOperations
     {
-        protected HubVirtualNetworkConnectionsClient() { }
+        protected HubRouteTablesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.HubRouteTable> Get(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.HubRouteTable>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.HubRouteTable> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.HubRouteTable> ListAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.HubRouteTablesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualHubName, string routeTableName, Azure.Management.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.HubRouteTablesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualHubName, string routeTableName, Azure.Management.Network.Models.HubRouteTable routeTableParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.HubRouteTablesDeleteOperation StartDelete(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.HubRouteTablesDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class HubVirtualNetworkConnectionsOperations
+    {
+        protected HubVirtualNetworkConnectionsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.HubVirtualNetworkConnection> Get(string resourceGroupName, string virtualHubName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.HubVirtualNetworkConnection>> GetAsync(string resourceGroupName, string virtualHubName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.HubVirtualNetworkConnection> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.HubVirtualNetworkConnection> ListAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class InboundNatRulesClient
-    {
-        protected InboundNatRulesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.InboundNatRule> Get(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.InboundNatRule>> GetAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.InboundNatRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.InboundNatRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.InboundNatRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.Management.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.InboundNatRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.Management.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.InboundNatRulesDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.InboundNatRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class InboundNatRulesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.InboundNatRule>
     {
         internal InboundNatRulesCreateOrUpdateOperation() { }
@@ -1129,21 +1117,17 @@ internal InboundNatRulesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class IpAllocationsClient
+    public partial class InboundNatRulesOperations
     {
-        protected IpAllocationsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.IpAllocation> Get(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpAllocation>> GetAsync(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.IpAllocation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpAllocation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.IpAllocation> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpAllocation> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.IpAllocationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpAllocationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.IpAllocationsDeleteOperation StartDelete(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpAllocationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.IpAllocation> UpdateTags(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpAllocation>> UpdateTagsAsync(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected InboundNatRulesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.InboundNatRule> Get(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.InboundNatRule>> GetAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.InboundNatRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.InboundNatRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.InboundNatRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.Management.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.InboundNatRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, Azure.Management.Network.Models.InboundNatRule inboundNatRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.InboundNatRulesDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.InboundNatRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string inboundNatRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class IpAllocationsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.IpAllocation>
     {
@@ -1171,21 +1155,21 @@ internal IpAllocationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class IpGroupsClient
+    public partial class IpAllocationsOperations
     {
-        protected IpGroupsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.IpGroup> Get(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpGroup>> GetAsync(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.IpGroup> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpGroup> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.IpGroup> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpGroup> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.IpGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.IpGroupsDeleteOperation StartDelete(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.IpGroup> UpdateGroups(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpGroup>> UpdateGroupsAsync(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected IpAllocationsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.IpAllocation> Get(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpAllocation>> GetAsync(string resourceGroupName, string ipAllocationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.IpAllocation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpAllocation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.IpAllocation> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpAllocation> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.IpAllocationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpAllocationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.IpAllocation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.IpAllocationsDeleteOperation StartDelete(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpAllocationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipAllocationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.IpAllocation> UpdateTags(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpAllocation>> UpdateTagsAsync(string resourceGroupName, string ipAllocationName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class IpGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.IpGroup>
     {
@@ -1213,17 +1197,21 @@ internal IpGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerBackendAddressPoolsClient
+    public partial class IpGroupsOperations
     {
-        protected LoadBalancerBackendAddressPoolsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.BackendAddressPool> Get(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.BackendAddressPool>> GetAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.BackendAddressPool> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BackendAddressPool> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.Management.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.Management.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerBackendAddressPoolsDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancerBackendAddressPoolsDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected IpGroupsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.IpGroup> Get(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpGroup>> GetAsync(string resourceGroupName, string ipGroupsName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.IpGroup> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpGroup> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.IpGroup> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.IpGroup> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.IpGroupsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpGroupsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.IpGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.IpGroupsDeleteOperation StartDelete(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.IpGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string ipGroupsName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.IpGroup> UpdateGroups(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IpGroup>> UpdateGroupsAsync(string resourceGroupName, string ipGroupsName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class LoadBalancerBackendAddressPoolsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.BackendAddressPool>
     {
@@ -1251,60 +1239,56 @@ internal LoadBalancerBackendAddressPoolsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerFrontendIPConfigurationsClient
+    public partial class LoadBalancerBackendAddressPoolsOperations
+    {
+        protected LoadBalancerBackendAddressPoolsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.BackendAddressPool> Get(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.BackendAddressPool>> GetAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.BackendAddressPool> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BackendAddressPool> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.Management.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancerBackendAddressPoolsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, Azure.Management.Network.Models.BackendAddressPool parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.LoadBalancerBackendAddressPoolsDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancerBackendAddressPoolsDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, string backendAddressPoolName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class LoadBalancerFrontendIPConfigurationsOperations
     {
-        protected LoadBalancerFrontendIPConfigurationsClient() { }
+        protected LoadBalancerFrontendIPConfigurationsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.FrontendIPConfiguration> Get(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.FrontendIPConfiguration>> GetAsync(string resourceGroupName, string loadBalancerName, string frontendIPConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.FrontendIPConfiguration> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.FrontendIPConfiguration> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerLoadBalancingRulesClient
+    public partial class LoadBalancerLoadBalancingRulesOperations
     {
-        protected LoadBalancerLoadBalancingRulesClient() { }
+        protected LoadBalancerLoadBalancingRulesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.LoadBalancingRule> Get(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LoadBalancingRule>> GetAsync(string resourceGroupName, string loadBalancerName, string loadBalancingRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancingRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancingRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerNetworkInterfacesClient
+    public partial class LoadBalancerNetworkInterfacesOperations
     {
-        protected LoadBalancerNetworkInterfacesClient() { }
+        protected LoadBalancerNetworkInterfacesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerOutboundRulesClient
+    public partial class LoadBalancerOutboundRulesOperations
     {
-        protected LoadBalancerOutboundRulesClient() { }
+        protected LoadBalancerOutboundRulesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.OutboundRule> Get(string resourceGroupName, string loadBalancerName, string outboundRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.OutboundRule>> GetAsync(string resourceGroupName, string loadBalancerName, string outboundRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.OutboundRule> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.OutboundRule> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancerProbesClient
+    public partial class LoadBalancerProbesOperations
     {
-        protected LoadBalancerProbesClient() { }
+        protected LoadBalancerProbesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.Probe> Get(string resourceGroupName, string loadBalancerName, string probeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.Probe>> GetAsync(string resourceGroupName, string loadBalancerName, string probeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.Probe> List(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.Probe> ListAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LoadBalancersClient
-    {
-        protected LoadBalancersClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.LoadBalancer> Get(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LoadBalancer>> GetAsync(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancer> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancer> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancer> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.LoadBalancersCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancersCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.LoadBalancersDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancersDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.LoadBalancer> UpdateTags(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LoadBalancer>> UpdateTagsAsync(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class LoadBalancersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.LoadBalancer>
     {
         internal LoadBalancersCreateOrUpdateOperation() { }
@@ -1331,19 +1315,21 @@ internal LoadBalancersDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class LocalNetworkGatewaysClient
+    public partial class LoadBalancersOperations
     {
-        protected LocalNetworkGatewaysClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway> Get(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway>> GetAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.LocalNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LocalNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.LocalNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LocalNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.LocalNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LocalNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway> UpdateTags(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway>> UpdateTagsAsync(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected LoadBalancersOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.LoadBalancer> Get(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LoadBalancer>> GetAsync(string resourceGroupName, string loadBalancerName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancer> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancer> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancer> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.LoadBalancersCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancersCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.LoadBalancer parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.LoadBalancersDeleteOperation StartDelete(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LoadBalancersDeleteOperation> StartDeleteAsync(string resourceGroupName, string loadBalancerName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.LoadBalancer> UpdateTags(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LoadBalancer>> UpdateTagsAsync(string resourceGroupName, string loadBalancerName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class LocalNetworkGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.LocalNetworkGateway>
     {
@@ -1371,21 +1357,19 @@ internal LocalNetworkGatewaysDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NatGatewaysClient
+    public partial class LocalNetworkGatewaysOperations
     {
-        protected NatGatewaysClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.NatGateway> Get(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NatGateway>> GetAsync(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NatGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NatGateway> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NatGateway> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NatGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NatGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NatGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NatGatewaysDeleteOperation StartDelete(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NatGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.NatGateway> UpdateTags(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NatGateway>> UpdateTagsAsync(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected LocalNetworkGatewaysOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway> Get(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway>> GetAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.LocalNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LocalNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.LocalNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LocalNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.LocalNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.LocalNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.LocalNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string localNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway> UpdateTags(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.LocalNetworkGateway>> UpdateTagsAsync(string resourceGroupName, string localNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class NatGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NatGateway>
     {
@@ -1413,49 +1397,35 @@ internal NatGatewaysDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkInterfaceIPConfigurationsClient
+    public partial class NatGatewaysOperations
     {
-        protected NetworkInterfaceIPConfigurationsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> Get(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NetworkInterfaceLoadBalancersClient
-    {
-        protected NetworkInterfaceLoadBalancersClient() { }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancer> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NetworkInterfacesClient
-    {
-        protected NetworkInterfacesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterface> Get(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterface>> GetAsync(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> GetVirtualMachineScaleSetIpConfiguration(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration>> GetVirtualMachineScaleSetIpConfigurationAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterface> GetVirtualMachineScaleSetNetworkInterface(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterface>> GetVirtualMachineScaleSetNetworkInterfaceAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurations(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurationsAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfacesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfacesDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfacesGetEffectiveRouteTableOperation StartGetEffectiveRouteTable(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesGetEffectiveRouteTableOperation> StartGetEffectiveRouteTableAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation StartListEffectiveNetworkSecurityGroups(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation> StartListEffectiveNetworkSecurityGroupsAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterface> UpdateTags(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterface>> UpdateTagsAsync(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected NatGatewaysOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.NatGateway> Get(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NatGateway>> GetAsync(string resourceGroupName, string natGatewayName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NatGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NatGateway> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NatGateway> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NatGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NatGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NatGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.NatGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NatGatewaysDeleteOperation StartDelete(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NatGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string natGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.NatGateway> UpdateTags(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NatGateway>> UpdateTagsAsync(string resourceGroupName, string natGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkInterfaceIPConfigurationsOperations
+    {
+        protected NetworkInterfaceIPConfigurationsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> Get(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string ipConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkInterfaceLoadBalancersOperations
+    {
+        protected NetworkInterfaceLoadBalancersOperations() { }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.LoadBalancer> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.LoadBalancer> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class NetworkInterfacesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NetworkInterface>
     {
@@ -1509,17 +1479,35 @@ internal NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.EffectiveNetworkSecurityGroupListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.EffectiveNetworkSecurityGroupListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkInterfaceTapConfigurationsClient
+    public partial class NetworkInterfacesOperations
     {
-        protected NetworkInterfaceTapConfigurationsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration> Get(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.Management.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.Management.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfaceTapConfigurationsDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfaceTapConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected NetworkInterfacesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterface> Get(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterface>> GetAsync(string resourceGroupName, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> GetVirtualMachineScaleSetIpConfiguration(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration>> GetVirtualMachineScaleSetIpConfigurationAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterface> GetVirtualMachineScaleSetNetworkInterface(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterface>> GetVirtualMachineScaleSetNetworkInterfaceAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurations(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterfaceIPConfiguration> ListVirtualMachineScaleSetIpConfigurationsAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfaces(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterface> ListVirtualMachineScaleSetVMNetworkInterfacesAsync(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkInterfacesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.NetworkInterface parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkInterfacesDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkInterfacesGetEffectiveRouteTableOperation StartGetEffectiveRouteTable(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesGetEffectiveRouteTableOperation> StartGetEffectiveRouteTableAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation StartListEffectiveNetworkSecurityGroups(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfacesListEffectiveNetworkSecurityGroupsOperation> StartListEffectiveNetworkSecurityGroupsAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterface> UpdateTags(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterface>> UpdateTagsAsync(string resourceGroupName, string networkInterfaceName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class NetworkInterfaceTapConfigurationsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration>
     {
@@ -1547,114 +1535,139 @@ internal NetworkInterfaceTapConfigurationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class NetworkInterfaceTapConfigurationsOperations
+    {
+        protected NetworkInterfaceTapConfigurationsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration> Get(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration>> GetAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration> List(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkInterfaceTapConfiguration> ListAsync(string resourceGroupName, string networkInterfaceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.Management.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfaceTapConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, Azure.Management.Network.Models.NetworkInterfaceTapConfiguration tapConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkInterfaceTapConfigurationsDeleteOperation StartDelete(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkInterfaceTapConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkInterfaceName, string tapConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class NetworkManagementClient
     {
         protected NetworkManagementClient() { }
         public NetworkManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.Management.Network.NetworkManagementClientOptions options = null) { }
         public NetworkManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.Management.Network.NetworkManagementClientOptions options = null) { }
-        public virtual Azure.Management.Network.ApplicationGatewaysClient GetApplicationGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.ApplicationSecurityGroupsClient GetApplicationSecurityGroupsClient() { throw null; }
-        public virtual Azure.Management.Network.AvailableDelegationsClient GetAvailableDelegationsClient() { throw null; }
-        public virtual Azure.Management.Network.AvailableEndpointServicesClient GetAvailableEndpointServicesClient() { throw null; }
-        public virtual Azure.Management.Network.AvailablePrivateEndpointTypesClient GetAvailablePrivateEndpointTypesClient() { throw null; }
-        public virtual Azure.Management.Network.AvailableResourceGroupDelegationsClient GetAvailableResourceGroupDelegationsClient() { throw null; }
-        public virtual Azure.Management.Network.AvailableServiceAliasesClient GetAvailableServiceAliasesClient() { throw null; }
-        public virtual Azure.Management.Network.AzureFirewallFqdnTagsClient GetAzureFirewallFqdnTagsClient() { throw null; }
-        public virtual Azure.Management.Network.AzureFirewallsClient GetAzureFirewallsClient() { throw null; }
-        public virtual Azure.Management.Network.BastionHostsClient GetBastionHostsClient() { throw null; }
-        public virtual Azure.Management.Network.BgpServiceCommunitiesClient GetBgpServiceCommunitiesClient() { throw null; }
-        public virtual Azure.Management.Network.ConnectionMonitorsClient GetConnectionMonitorsClient() { throw null; }
-        public virtual Azure.Management.Network.DdosCustomPoliciesClient GetDdosCustomPoliciesClient() { throw null; }
-        public virtual Azure.Management.Network.DdosProtectionPlansClient GetDdosProtectionPlansClient() { throw null; }
-        public virtual Azure.Management.Network.DefaultSecurityRulesClient GetDefaultSecurityRulesClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitAuthorizationsClient GetExpressRouteCircuitAuthorizationsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitConnectionsClient GetExpressRouteCircuitConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitPeeringsClient GetExpressRouteCircuitPeeringsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCircuitsClient GetExpressRouteCircuitsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteConnectionsClient GetExpressRouteConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionPeeringsClient GetExpressRouteCrossConnectionPeeringsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsClient GetExpressRouteCrossConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteGatewaysClient GetExpressRouteGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteLinksClient GetExpressRouteLinksClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRoutePortsClient GetExpressRoutePortsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRoutePortsLocationsClient GetExpressRoutePortsLocationsClient() { throw null; }
-        public virtual Azure.Management.Network.ExpressRouteServiceProvidersClient GetExpressRouteServiceProvidersClient() { throw null; }
-        public virtual Azure.Management.Network.FirewallPoliciesClient GetFirewallPoliciesClient() { throw null; }
-        public virtual Azure.Management.Network.FirewallPolicyRuleGroupsClient GetFirewallPolicyRuleGroupsClient() { throw null; }
-        public virtual Azure.Management.Network.FlowLogsClient GetFlowLogsClient() { throw null; }
-        public virtual Azure.Management.Network.HubRouteTablesClient GetHubRouteTablesClient() { throw null; }
-        public virtual Azure.Management.Network.HubVirtualNetworkConnectionsClient GetHubVirtualNetworkConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.InboundNatRulesClient GetInboundNatRulesClient() { throw null; }
-        public virtual Azure.Management.Network.IpAllocationsClient GetIpAllocationsClient() { throw null; }
-        public virtual Azure.Management.Network.IpGroupsClient GetIpGroupsClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerBackendAddressPoolsClient GetLoadBalancerBackendAddressPoolsClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerFrontendIPConfigurationsClient GetLoadBalancerFrontendIPConfigurationsClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerLoadBalancingRulesClient GetLoadBalancerLoadBalancingRulesClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerNetworkInterfacesClient GetLoadBalancerNetworkInterfacesClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerOutboundRulesClient GetLoadBalancerOutboundRulesClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancerProbesClient GetLoadBalancerProbesClient() { throw null; }
-        public virtual Azure.Management.Network.LoadBalancersClient GetLoadBalancersClient() { throw null; }
-        public virtual Azure.Management.Network.LocalNetworkGatewaysClient GetLocalNetworkGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.NatGatewaysClient GetNatGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfaceIPConfigurationsClient GetNetworkInterfaceIPConfigurationsClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfaceLoadBalancersClient GetNetworkInterfaceLoadBalancersClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfacesClient GetNetworkInterfacesClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkInterfaceTapConfigurationsClient GetNetworkInterfaceTapConfigurationsClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkProfilesClient GetNetworkProfilesClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkSecurityGroupsClient GetNetworkSecurityGroupsClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkVirtualAppliancesClient GetNetworkVirtualAppliancesClient() { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersClient GetNetworkWatchersClient() { throw null; }
-        public virtual Azure.Management.Network.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysClient GetP2SVpnGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.PacketCapturesClient GetPacketCapturesClient() { throw null; }
-        public virtual Azure.Management.Network.PeerExpressRouteCircuitConnectionsClient GetPeerExpressRouteCircuitConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.PrivateDnsZoneGroupsClient GetPrivateDnsZoneGroupsClient() { throw null; }
-        public virtual Azure.Management.Network.PrivateEndpointsClient GetPrivateEndpointsClient() { throw null; }
-        public virtual Azure.Management.Network.PrivateLinkServicesClient GetPrivateLinkServicesClient() { throw null; }
-        public virtual Azure.Management.Network.PublicIPAddressesClient GetPublicIPAddressesClient() { throw null; }
-        public virtual Azure.Management.Network.PublicIPPrefixesClient GetPublicIPPrefixesClient() { throw null; }
-        public virtual Azure.Management.Network.ResourceNavigationLinksClient GetResourceNavigationLinksClient() { throw null; }
-        public virtual Azure.Management.Network.RouteFilterRulesClient GetRouteFilterRulesClient() { throw null; }
-        public virtual Azure.Management.Network.RouteFiltersClient GetRouteFiltersClient() { throw null; }
-        public virtual Azure.Management.Network.RoutesClient GetRoutesClient() { throw null; }
-        public virtual Azure.Management.Network.RouteTablesClient GetRouteTablesClient() { throw null; }
-        public virtual Azure.Management.Network.SecurityPartnerProvidersClient GetSecurityPartnerProvidersClient() { throw null; }
-        public virtual Azure.Management.Network.SecurityRulesClient GetSecurityRulesClient() { throw null; }
-        public virtual Azure.Management.Network.ServiceAssociationLinksClient GetServiceAssociationLinksClient() { throw null; }
-        public virtual Azure.Management.Network.ServiceClient GetServiceClient() { throw null; }
-        public virtual Azure.Management.Network.ServiceEndpointPoliciesClient GetServiceEndpointPoliciesClient() { throw null; }
-        public virtual Azure.Management.Network.ServiceEndpointPolicyDefinitionsClient GetServiceEndpointPolicyDefinitionsClient() { throw null; }
-        public virtual Azure.Management.Network.ServiceTagsClient GetServiceTagsClient() { throw null; }
-        public virtual Azure.Management.Network.SubnetsClient GetSubnetsClient() { throw null; }
-        public virtual Azure.Management.Network.UsagesClient GetUsagesClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualHubRouteTableV2SClient GetVirtualHubRouteTableV2SClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualHubsClient GetVirtualHubsClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewayConnectionsClient GetVirtualNetworkGatewayConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysClient GetVirtualNetworkGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkPeeringsClient GetVirtualNetworkPeeringsClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworksClient GetVirtualNetworksClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkTapsClient GetVirtualNetworkTapsClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualRouterPeeringsClient GetVirtualRouterPeeringsClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualRoutersClient GetVirtualRoutersClient() { throw null; }
-        public virtual Azure.Management.Network.VirtualWansClient GetVirtualWansClient() { throw null; }
-        public virtual Azure.Management.Network.VpnConnectionsClient GetVpnConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.VpnGatewaysClient GetVpnGatewaysClient() { throw null; }
-        public virtual Azure.Management.Network.VpnLinkConnectionsClient GetVpnLinkConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.VpnServerConfigurationsAssociatedWithVirtualWanClient GetVpnServerConfigurationsAssociatedWithVirtualWanClient() { throw null; }
-        public virtual Azure.Management.Network.VpnServerConfigurationsClient GetVpnServerConfigurationsClient() { throw null; }
-        public virtual Azure.Management.Network.VpnSiteLinkConnectionsClient GetVpnSiteLinkConnectionsClient() { throw null; }
-        public virtual Azure.Management.Network.VpnSiteLinksClient GetVpnSiteLinksClient() { throw null; }
-        public virtual Azure.Management.Network.VpnSitesClient GetVpnSitesClient() { throw null; }
-        public virtual Azure.Management.Network.VpnSitesConfigurationClient GetVpnSitesConfigurationClient() { throw null; }
-        public virtual Azure.Management.Network.WebApplicationFirewallPoliciesClient GetWebApplicationFirewallPoliciesClient() { throw null; }
+        public virtual Azure.Management.Network.ApplicationGatewaysOperations ApplicationGateways { get { throw null; } }
+        public virtual Azure.Management.Network.ApplicationSecurityGroupsOperations ApplicationSecurityGroups { get { throw null; } }
+        public virtual Azure.Management.Network.AvailableDelegationsOperations AvailableDelegations { get { throw null; } }
+        public virtual Azure.Management.Network.AvailableEndpointServicesOperations AvailableEndpointServices { get { throw null; } }
+        public virtual Azure.Management.Network.AvailablePrivateEndpointTypesOperations AvailablePrivateEndpointTypes { get { throw null; } }
+        public virtual Azure.Management.Network.AvailableResourceGroupDelegationsOperations AvailableResourceGroupDelegations { get { throw null; } }
+        public virtual Azure.Management.Network.AvailableServiceAliasesOperations AvailableServiceAliases { get { throw null; } }
+        public virtual Azure.Management.Network.AzureFirewallFqdnTagsOperations AzureFirewallFqdnTags { get { throw null; } }
+        public virtual Azure.Management.Network.AzureFirewallsOperations AzureFirewalls { get { throw null; } }
+        public virtual Azure.Management.Network.BastionHostsOperations BastionHosts { get { throw null; } }
+        public virtual Azure.Management.Network.BgpServiceCommunitiesOperations BgpServiceCommunities { get { throw null; } }
+        public virtual Azure.Management.Network.ConnectionMonitorsOperations ConnectionMonitors { get { throw null; } }
+        public virtual Azure.Management.Network.DdosCustomPoliciesOperations DdosCustomPolicies { get { throw null; } }
+        public virtual Azure.Management.Network.DdosProtectionPlansOperations DdosProtectionPlans { get { throw null; } }
+        public virtual Azure.Management.Network.DefaultSecurityRulesOperations DefaultSecurityRules { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteCircuitAuthorizationsOperations ExpressRouteCircuitAuthorizations { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteCircuitConnectionsOperations ExpressRouteCircuitConnections { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteCircuitPeeringsOperations ExpressRouteCircuitPeerings { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteCircuitsOperations ExpressRouteCircuits { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteConnectionsOperations ExpressRouteConnections { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionPeeringsOperations ExpressRouteCrossConnectionPeerings { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteCrossConnectionsOperations ExpressRouteCrossConnections { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteGatewaysOperations ExpressRouteGateways { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteLinksOperations ExpressRouteLinks { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRoutePortsOperations ExpressRoutePorts { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRoutePortsLocationsOperations ExpressRoutePortsLocations { get { throw null; } }
+        public virtual Azure.Management.Network.ExpressRouteServiceProvidersOperations ExpressRouteServiceProviders { get { throw null; } }
+        public virtual Azure.Management.Network.FirewallPoliciesOperations FirewallPolicies { get { throw null; } }
+        public virtual Azure.Management.Network.FirewallPolicyRuleGroupsOperations FirewallPolicyRuleGroups { get { throw null; } }
+        public virtual Azure.Management.Network.FlowLogsOperations FlowLogs { get { throw null; } }
+        public virtual Azure.Management.Network.HubRouteTablesOperations HubRouteTables { get { throw null; } }
+        public virtual Azure.Management.Network.HubVirtualNetworkConnectionsOperations HubVirtualNetworkConnections { get { throw null; } }
+        public virtual Azure.Management.Network.InboundNatRulesOperations InboundNatRules { get { throw null; } }
+        public virtual Azure.Management.Network.IpAllocationsOperations IpAllocations { get { throw null; } }
+        public virtual Azure.Management.Network.IpGroupsOperations IpGroups { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancerBackendAddressPoolsOperations LoadBalancerBackendAddressPools { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancerFrontendIPConfigurationsOperations LoadBalancerFrontendIPConfigurations { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancerLoadBalancingRulesOperations LoadBalancerLoadBalancingRules { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancerNetworkInterfacesOperations LoadBalancerNetworkInterfaces { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancerOutboundRulesOperations LoadBalancerOutboundRules { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancerProbesOperations LoadBalancerProbes { get { throw null; } }
+        public virtual Azure.Management.Network.LoadBalancersOperations LoadBalancers { get { throw null; } }
+        public virtual Azure.Management.Network.LocalNetworkGatewaysOperations LocalNetworkGateways { get { throw null; } }
+        public virtual Azure.Management.Network.NatGatewaysOperations NatGateways { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkInterfaceIPConfigurationsOperations NetworkInterfaceIPConfigurations { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkInterfaceLoadBalancersOperations NetworkInterfaceLoadBalancers { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkInterfacesOperations NetworkInterfaces { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkInterfaceTapConfigurationsOperations NetworkInterfaceTapConfigurations { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkProfilesOperations NetworkProfiles { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkSecurityGroupsOperations NetworkSecurityGroups { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkVirtualAppliancesOperations NetworkVirtualAppliances { get { throw null; } }
+        public virtual Azure.Management.Network.NetworkWatchersOperations NetworkWatchers { get { throw null; } }
+        public virtual Azure.Management.Network.Operations Operations { get { throw null; } }
+        public virtual Azure.Management.Network.P2SVpnGatewaysOperations P2SVpnGateways { get { throw null; } }
+        public virtual Azure.Management.Network.PacketCapturesOperations PacketCaptures { get { throw null; } }
+        public virtual Azure.Management.Network.PeerExpressRouteCircuitConnectionsOperations PeerExpressRouteCircuitConnections { get { throw null; } }
+        public virtual Azure.Management.Network.PrivateDnsZoneGroupsOperations PrivateDnsZoneGroups { get { throw null; } }
+        public virtual Azure.Management.Network.PrivateEndpointsOperations PrivateEndpoints { get { throw null; } }
+        public virtual Azure.Management.Network.PrivateLinkServicesOperations PrivateLinkServices { get { throw null; } }
+        public virtual Azure.Management.Network.PublicIPAddressesOperations PublicIPAddresses { get { throw null; } }
+        public virtual Azure.Management.Network.PublicIPPrefixesOperations PublicIPPrefixes { get { throw null; } }
+        public virtual Azure.Management.Network.ResourceNavigationLinksOperations ResourceNavigationLinks { get { throw null; } }
+        public virtual Azure.Management.Network.RouteFilterRulesOperations RouteFilterRules { get { throw null; } }
+        public virtual Azure.Management.Network.RouteFiltersOperations RouteFilters { get { throw null; } }
+        public virtual Azure.Management.Network.RoutesOperations Routes { get { throw null; } }
+        public virtual Azure.Management.Network.RouteTablesOperations RouteTables { get { throw null; } }
+        public virtual Azure.Management.Network.SecurityPartnerProvidersOperations SecurityPartnerProviders { get { throw null; } }
+        public virtual Azure.Management.Network.SecurityRulesOperations SecurityRules { get { throw null; } }
+        public virtual Azure.Management.Network.ServiceOperations Service { get { throw null; } }
+        public virtual Azure.Management.Network.ServiceAssociationLinksOperations ServiceAssociationLinks { get { throw null; } }
+        public virtual Azure.Management.Network.ServiceEndpointPoliciesOperations ServiceEndpointPolicies { get { throw null; } }
+        public virtual Azure.Management.Network.ServiceEndpointPolicyDefinitionsOperations ServiceEndpointPolicyDefinitions { get { throw null; } }
+        public virtual Azure.Management.Network.ServiceTagsOperations ServiceTags { get { throw null; } }
+        public virtual Azure.Management.Network.SubnetsOperations Subnets { get { throw null; } }
+        public virtual Azure.Management.Network.UsagesOperations Usages { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualHubRouteTableV2SOperations VirtualHubRouteTableV2S { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualHubsOperations VirtualHubs { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualNetworkGatewayConnectionsOperations VirtualNetworkGatewayConnections { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysOperations VirtualNetworkGateways { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualNetworkPeeringsOperations VirtualNetworkPeerings { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualNetworksOperations VirtualNetworks { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualNetworkTapsOperations VirtualNetworkTaps { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualRouterPeeringsOperations VirtualRouterPeerings { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualRoutersOperations VirtualRouters { get { throw null; } }
+        public virtual Azure.Management.Network.VirtualWansOperations VirtualWans { get { throw null; } }
+        public virtual Azure.Management.Network.VpnConnectionsOperations VpnConnections { get { throw null; } }
+        public virtual Azure.Management.Network.VpnGatewaysOperations VpnGateways { get { throw null; } }
+        public virtual Azure.Management.Network.VpnLinkConnectionsOperations VpnLinkConnections { get { throw null; } }
+        public virtual Azure.Management.Network.VpnServerConfigurationsOperations VpnServerConfigurations { get { throw null; } }
+        public virtual Azure.Management.Network.VpnServerConfigurationsAssociatedWithVirtualWanOperations VpnServerConfigurationsAssociatedWithVirtualWan { get { throw null; } }
+        public virtual Azure.Management.Network.VpnSiteLinkConnectionsOperations VpnSiteLinkConnections { get { throw null; } }
+        public virtual Azure.Management.Network.VpnSiteLinksOperations VpnSiteLinks { get { throw null; } }
+        public virtual Azure.Management.Network.VpnSitesOperations VpnSites { get { throw null; } }
+        public virtual Azure.Management.Network.VpnSitesConfigurationOperations VpnSitesConfiguration { get { throw null; } }
+        public virtual Azure.Management.Network.WebApplicationFirewallPoliciesOperations WebApplicationFirewallPolicies { get { throw null; } }
     }
     public partial class NetworkManagementClientOptions : Azure.Core.ClientOptions
     {
         public NetworkManagementClientOptions() { }
     }
-    public partial class NetworkProfilesClient
+    public partial class NetworkProfilesDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal NetworkProfilesDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkProfilesOperations
     {
-        protected NetworkProfilesClient() { }
+        protected NetworkProfilesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkProfile> CreateOrUpdate(string resourceGroupName, string networkProfileName, Azure.Management.Network.Models.NetworkProfile parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkProfile>> CreateOrUpdateAsync(string resourceGroupName, string networkProfileName, Azure.Management.Network.Models.NetworkProfile parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkProfile> Get(string resourceGroupName, string networkProfileName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1668,9 +1681,22 @@ protected NetworkProfilesClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkProfile> UpdateTags(string resourceGroupName, string networkProfileName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkProfile>> UpdateTagsAsync(string resourceGroupName, string networkProfileName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkProfilesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class NetworkSecurityGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NetworkSecurityGroup>
     {
-        internal NetworkProfilesDeleteOperation() { }
+        internal NetworkSecurityGroupsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Network.Models.NetworkSecurityGroup Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class NetworkSecurityGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal NetworkSecurityGroupsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1681,9 +1707,9 @@ internal NetworkProfilesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkSecurityGroupsClient
+    public partial class NetworkSecurityGroupsOperations
     {
-        protected NetworkSecurityGroupsClient() { }
+        protected NetworkSecurityGroupsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup> Get(string resourceGroupName, string networkSecurityGroupName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkSecurityGroup> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1697,22 +1723,22 @@ protected NetworkSecurityGroupsClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup> UpdateTags(string resourceGroupName, string networkSecurityGroupName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup>> UpdateTagsAsync(string resourceGroupName, string networkSecurityGroupName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkSecurityGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NetworkSecurityGroup>
+    public partial class NetworkVirtualAppliancesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NetworkVirtualAppliance>
     {
-        internal NetworkSecurityGroupsCreateOrUpdateOperation() { }
+        internal NetworkVirtualAppliancesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.NetworkSecurityGroup Value { get { throw null; } }
+        public override Azure.Management.Network.Models.NetworkVirtualAppliance Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkSecurityGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkSecurityGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class NetworkVirtualAppliancesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal NetworkSecurityGroupsDeleteOperation() { }
+        internal NetworkVirtualAppliancesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -1723,9 +1749,9 @@ internal NetworkSecurityGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkVirtualAppliancesClient
+    public partial class NetworkVirtualAppliancesOperations
     {
-        protected NetworkVirtualAppliancesClient() { }
+        protected NetworkVirtualAppliancesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance> Get(string resourceGroupName, string networkVirtualApplianceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance>> GetAsync(string resourceGroupName, string networkVirtualApplianceName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkVirtualAppliance> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -1739,32 +1765,6 @@ protected NetworkVirtualAppliancesClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance> UpdateTags(string resourceGroupName, string networkVirtualApplianceName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance>> UpdateTagsAsync(string resourceGroupName, string networkVirtualApplianceName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkVirtualAppliancesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.NetworkVirtualAppliance>
-    {
-        internal NetworkVirtualAppliancesCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.NetworkVirtualAppliance Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.NetworkVirtualAppliance>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class NetworkVirtualAppliancesDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal NetworkVirtualAppliancesDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class NetworkWatchersCheckConnectivityOperation : Azure.Operation<Azure.Management.Network.Models.ConnectivityInformation>
     {
         internal NetworkWatchersCheckConnectivityOperation() { }
@@ -1778,46 +1778,6 @@ internal NetworkWatchersCheckConnectivityOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ConnectivityInformation>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.ConnectivityInformation>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class NetworkWatchersClient
-    {
-        protected NetworkWatchersClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkWatcher> CreateOrUpdate(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkWatcher>> CreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkWatcher> Get(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkWatcher>> GetAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.Topology> GetTopology(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.Topology>> GetTopologyAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkWatcher> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkWatcher> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkWatcher> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkWatcher> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersCheckConnectivityOperation StartCheckConnectivity(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersCheckConnectivityOperation> StartCheckConnectivityAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetAzureReachabilityReportOperation StartGetAzureReachabilityReport(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetAzureReachabilityReportOperation> StartGetAzureReachabilityReportAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetFlowLogStatusOperation StartGetFlowLogStatus(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetFlowLogStatusOperation> StartGetFlowLogStatusAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation StartGetNetworkConfigurationDiagnostic(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation> StartGetNetworkConfigurationDiagnosticAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetNextHopOperation StartGetNextHop(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetNextHopOperation> StartGetNextHopAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetTroubleshootingOperation StartGetTroubleshooting(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetTroubleshootingOperation> StartGetTroubleshootingAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetTroubleshootingResultOperation StartGetTroubleshootingResult(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetTroubleshootingResultOperation> StartGetTroubleshootingResultAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersGetVMSecurityRulesOperation StartGetVMSecurityRules(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetVMSecurityRulesOperation> StartGetVMSecurityRulesAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersListAvailableProvidersOperation StartListAvailableProviders(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersListAvailableProvidersOperation> StartListAvailableProvidersAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersSetFlowLogConfigurationOperation StartSetFlowLogConfiguration(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersSetFlowLogConfigurationOperation> StartSetFlowLogConfigurationAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.NetworkWatchersVerifyIPFlowOperation StartVerifyIPFlow(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersVerifyIPFlowOperation> StartVerifyIPFlowAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.NetworkWatcher> UpdateTags(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkWatcher>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class NetworkWatchersDeleteOperation : Azure.Operation<Azure.Response>
     {
         internal NetworkWatchersDeleteOperation() { }
@@ -1935,6 +1895,46 @@ internal NetworkWatchersListAvailableProvidersOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.AvailableProvidersList>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.AvailableProvidersList>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class NetworkWatchersOperations
+    {
+        protected NetworkWatchersOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkWatcher> CreateOrUpdate(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkWatcher>> CreateOrUpdateAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkWatcher parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkWatcher> Get(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkWatcher>> GetAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.Topology> GetTopology(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.Topology>> GetTopologyAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TopologyParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkWatcher> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.NetworkWatcher> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkWatcher> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.NetworkWatcher> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersCheckConnectivityOperation StartCheckConnectivity(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersCheckConnectivityOperation> StartCheckConnectivityAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.ConnectivityParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetAzureReachabilityReportOperation StartGetAzureReachabilityReport(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetAzureReachabilityReportOperation> StartGetAzureReachabilityReportAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AzureReachabilityReportParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetFlowLogStatusOperation StartGetFlowLogStatus(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetFlowLogStatusOperation> StartGetFlowLogStatusAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogStatusParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation StartGetNetworkConfigurationDiagnostic(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetNetworkConfigurationDiagnosticOperation> StartGetNetworkConfigurationDiagnosticAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NetworkConfigurationDiagnosticParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetNextHopOperation StartGetNextHop(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetNextHopOperation> StartGetNextHopAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.NextHopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetTroubleshootingOperation StartGetTroubleshooting(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetTroubleshootingOperation> StartGetTroubleshootingAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetTroubleshootingResultOperation StartGetTroubleshootingResult(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetTroubleshootingResultOperation> StartGetTroubleshootingResultAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.QueryTroubleshootingParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersGetVMSecurityRulesOperation StartGetVMSecurityRules(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersGetVMSecurityRulesOperation> StartGetVMSecurityRulesAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.SecurityGroupViewParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersListAvailableProvidersOperation StartListAvailableProviders(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersListAvailableProvidersOperation> StartListAvailableProvidersAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.AvailableProvidersListParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersSetFlowLogConfigurationOperation StartSetFlowLogConfiguration(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersSetFlowLogConfigurationOperation> StartSetFlowLogConfigurationAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.FlowLogInformation parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.NetworkWatchersVerifyIPFlowOperation StartVerifyIPFlow(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.NetworkWatchersVerifyIPFlowOperation> StartVerifyIPFlowAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.VerificationIPFlowParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.NetworkWatcher> UpdateTags(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.NetworkWatcher>> UpdateTagsAsync(string resourceGroupName, string networkWatcherName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class NetworkWatchersSetFlowLogConfigurationOperation : Azure.Operation<Azure.Management.Network.Models.FlowLogInformation>
     {
         internal NetworkWatchersSetFlowLogConfigurationOperation() { }
@@ -1961,36 +1961,12 @@ internal NetworkWatchersVerifyIPFlowOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VerificationIPFlowResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VerificationIPFlowResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class P2SVpnGatewaysClient
-    {
-        protected P2SVpnGatewaysClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.P2SVpnGateway> Get(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.P2SVpnGateway>> GetAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.P2SVpnGateway> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.P2SVpnGateway> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.P2SVpnGateway> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.P2SVpnGateway> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysDeleteOperation StartDelete(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation StartDisconnectP2SVpnConnections(string resourceGroupName, string p2SVpnGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation> StartDisconnectP2SVpnConnectionsAsync(string resourceGroupName, string p2SVpnGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation StartGetP2SVpnConnectionHealth(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation> StartGetP2SVpnConnectionHealthAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation StartGetP2SVpnConnectionHealthDetailed(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation> StartGetP2SVpnConnectionHealthDetailedAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.P2SVpnGateway> UpdateTags(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.P2SVpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class P2SVpnGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.P2SVpnGateway>
     {
         internal P2SVpnGatewaysCreateOrUpdateOperation() { }
@@ -2069,21 +2045,29 @@ internal P2SVpnGatewaysGetP2SVpnConnectionHealthOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.P2SVpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.P2SVpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PacketCapturesClient
+    public partial class P2SVpnGatewaysOperations
     {
-        protected PacketCapturesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.PacketCaptureResult> Get(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PacketCaptureResult>> GetAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.PacketCaptureResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.PacketCaptureResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.PacketCapturesCreateOperation StartCreate(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.Management.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesCreateOperation> StartCreateAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.Management.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.PacketCapturesDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.PacketCapturesGetStatusOperation StartGetStatus(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesGetStatusOperation> StartGetStatusAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.PacketCapturesStopOperation StartStop(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected P2SVpnGatewaysOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.P2SVpnGateway> Get(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.P2SVpnGateway>> GetAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.P2SVpnGateway> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.P2SVpnGateway> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.P2SVpnGateway> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.P2SVpnGateway> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.P2SVpnGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnGateway p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.P2SVpnGatewaysDeleteOperation StartDelete(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation StartDisconnectP2SVpnConnections(string resourceGroupName, string p2SVpnGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysDisconnectP2SVpnConnectionsOperation> StartDisconnectP2SVpnConnectionsAsync(string resourceGroupName, string p2SVpnGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.P2SVpnGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnProfileParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation StartGetP2SVpnConnectionHealth(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthOperation> StartGetP2SVpnConnectionHealthAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation StartGetP2SVpnConnectionHealthDetailed(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.P2SVpnGatewaysGetP2SVpnConnectionHealthDetailedOperation> StartGetP2SVpnConnectionHealthDetailedAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.P2SVpnConnectionHealthRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.P2SVpnGateway> UpdateTags(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.P2SVpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.TagsObject p2SVpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class PacketCapturesCreateOperation : Azure.Operation<Azure.Management.Network.Models.PacketCaptureResult>
     {
@@ -2124,6 +2108,22 @@ internal PacketCapturesGetStatusOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PacketCaptureQueryStatusResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PacketCaptureQueryStatusResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class PacketCapturesOperations
+    {
+        protected PacketCapturesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.PacketCaptureResult> Get(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PacketCaptureResult>> GetAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.PacketCaptureResult> List(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.PacketCaptureResult> ListAsync(string resourceGroupName, string networkWatcherName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.PacketCapturesCreateOperation StartCreate(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.Management.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesCreateOperation> StartCreateAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, Azure.Management.Network.Models.PacketCapture parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.PacketCapturesDeleteOperation StartDelete(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.PacketCapturesGetStatusOperation StartGetStatus(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesGetStatusOperation> StartGetStatusAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.PacketCapturesStopOperation StartStop(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.PacketCapturesStopOperation> StartStopAsync(string resourceGroupName, string networkWatcherName, string packetCaptureName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class PacketCapturesStopOperation : Azure.Operation<Azure.Response>
     {
         internal PacketCapturesStopOperation() { }
@@ -2137,17 +2137,43 @@ internal PacketCapturesStopOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PeerExpressRouteCircuitConnectionsClient
+    public partial class PeerExpressRouteCircuitConnectionsOperations
     {
-        protected PeerExpressRouteCircuitConnectionsClient() { }
+        protected PeerExpressRouteCircuitConnectionsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PeerExpressRouteCircuitConnection> Get(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PeerExpressRouteCircuitConnection>> GetAsync(string resourceGroupName, string circuitName, string peeringName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.PeerExpressRouteCircuitConnection> List(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.PeerExpressRouteCircuitConnection> ListAsync(string resourceGroupName, string circuitName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateDnsZoneGroupsClient
+    public partial class PrivateDnsZoneGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PrivateDnsZoneGroup>
+    {
+        internal PrivateDnsZoneGroupsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Network.Models.PrivateDnsZoneGroup Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateDnsZoneGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal PrivateDnsZoneGroupsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateDnsZoneGroupsOperations
     {
-        protected PrivateDnsZoneGroupsClient() { }
+        protected PrivateDnsZoneGroupsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PrivateDnsZoneGroup> Get(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PrivateDnsZoneGroup>> GetAsync(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.PrivateDnsZoneGroup> List(string privateEndpointName, string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2157,22 +2183,22 @@ protected PrivateDnsZoneGroupsClient() { }
         public virtual Azure.Management.Network.PrivateDnsZoneGroupsDeleteOperation StartDelete(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.PrivateDnsZoneGroupsDeleteOperation> StartDeleteAsync(string resourceGroupName, string privateEndpointName, string privateDnsZoneGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateDnsZoneGroupsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PrivateDnsZoneGroup>
+    public partial class PrivateEndpointsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PrivateEndpoint>
     {
-        internal PrivateDnsZoneGroupsCreateOrUpdateOperation() { }
+        internal PrivateEndpointsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.PrivateDnsZoneGroup Value { get { throw null; } }
+        public override Azure.Management.Network.Models.PrivateEndpoint Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateDnsZoneGroup>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateDnsZoneGroupsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PrivateEndpointsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PrivateDnsZoneGroupsDeleteOperation() { }
+        internal PrivateEndpointsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2183,9 +2209,9 @@ internal PrivateDnsZoneGroupsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointsClient
+    public partial class PrivateEndpointsOperations
     {
-        protected PrivateEndpointsClient() { }
+        protected PrivateEndpointsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PrivateEndpoint> Get(string resourceGroupName, string privateEndpointName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PrivateEndpoint>> GetAsync(string resourceGroupName, string privateEndpointName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.PrivateEndpoint> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2197,22 +2223,35 @@ protected PrivateEndpointsClient() { }
         public virtual Azure.Management.Network.PrivateEndpointsDeleteOperation StartDelete(string resourceGroupName, string privateEndpointName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.PrivateEndpointsDeleteOperation> StartDeleteAsync(string resourceGroupName, string privateEndpointName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PrivateEndpoint>
+    public partial class PrivateLinkServicesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PrivateLinkService>
     {
-        internal PrivateEndpointsCreateOrUpdateOperation() { }
+        internal PrivateLinkServicesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.PrivateEndpoint Value { get { throw null; } }
+        public override Azure.Management.Network.Models.PrivateLinkService Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateEndpoint>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PrivateLinkServicesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PrivateEndpointsDeleteOperation() { }
+        internal PrivateLinkServicesDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class PrivateLinkServicesDeletePrivateEndpointConnectionOperation : Azure.Operation<Azure.Response>
+    {
+        internal PrivateLinkServicesDeletePrivateEndpointConnectionOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2223,9 +2262,9 @@ internal PrivateEndpointsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkServicesClient
+    public partial class PrivateLinkServicesOperations
     {
-        protected PrivateLinkServicesClient() { }
+        protected PrivateLinkServicesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibility(string location, Azure.Management.Network.Models.CheckPrivateLinkServiceVisibilityRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PrivateLinkServiceVisibility>> CheckPrivateLinkServiceVisibilityAsync(string location, Azure.Management.Network.Models.CheckPrivateLinkServiceVisibilityRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Network.Models.PrivateLinkServiceVisibility> CheckPrivateLinkServiceVisibilityByResourceGroup(string location, string resourceGroupName, Azure.Management.Network.Models.CheckPrivateLinkServiceVisibilityRequest parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2253,35 +2292,22 @@ protected PrivateLinkServicesClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PrivateEndpointConnection> UpdatePrivateEndpointConnection(string resourceGroupName, string serviceName, string peConnectionName, Azure.Management.Network.Models.PrivateEndpointConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PrivateEndpointConnection>> UpdatePrivateEndpointConnectionAsync(string resourceGroupName, string serviceName, string peConnectionName, Azure.Management.Network.Models.PrivateEndpointConnection parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkServicesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PrivateLinkService>
-    {
-        internal PrivateLinkServicesCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.PrivateLinkService Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PrivateLinkService>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class PrivateLinkServicesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PublicIPAddressesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PublicIPAddress>
     {
-        internal PrivateLinkServicesDeleteOperation() { }
+        internal PublicIPAddressesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Management.Network.Models.PublicIPAddress Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkServicesDeletePrivateEndpointConnectionOperation : Azure.Operation<Azure.Response>
+    public partial class PublicIPAddressesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PrivateLinkServicesDeletePrivateEndpointConnectionOperation() { }
+        internal PublicIPAddressesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2292,9 +2318,9 @@ internal PrivateLinkServicesDeletePrivateEndpointConnectionOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPAddressesClient
+    public partial class PublicIPAddressesOperations
     {
-        protected PublicIPAddressesClient() { }
+        protected PublicIPAddressesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PublicIPAddress> Get(string resourceGroupName, string publicIpAddressName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PublicIPAddress>> GetAsync(string resourceGroupName, string publicIpAddressName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Network.Models.PublicIPAddress> GetVirtualMachineScaleSetPublicIPAddress(string resourceGroupName, string virtualMachineScaleSetName, string virtualmachineIndex, string networkInterfaceName, string ipConfigurationName, string publicIpAddressName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2314,22 +2340,22 @@ protected PublicIPAddressesClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PublicIPAddress> UpdateTags(string resourceGroupName, string publicIpAddressName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PublicIPAddress>> UpdateTagsAsync(string resourceGroupName, string publicIpAddressName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPAddressesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PublicIPAddress>
+    public partial class PublicIPPrefixesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PublicIPPrefix>
     {
-        internal PublicIPAddressesCreateOrUpdateOperation() { }
+        internal PublicIPPrefixesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.PublicIPAddress Value { get { throw null; } }
+        public override Azure.Management.Network.Models.PublicIPPrefix Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPAddress>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPAddressesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class PublicIPPrefixesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PublicIPAddressesDeleteOperation() { }
+        internal PublicIPPrefixesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2340,9 +2366,9 @@ internal PublicIPAddressesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPPrefixesClient
+    public partial class PublicIPPrefixesOperations
     {
-        protected PublicIPPrefixesClient() { }
+        protected PublicIPPrefixesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PublicIPPrefix> Get(string resourceGroupName, string publicIpPrefixName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PublicIPPrefix>> GetAsync(string resourceGroupName, string publicIpPrefixName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.PublicIPPrefix> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2356,22 +2382,28 @@ protected PublicIPPrefixesClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.PublicIPPrefix> UpdateTags(string resourceGroupName, string publicIpPrefixName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.PublicIPPrefix>> UpdateTagsAsync(string resourceGroupName, string publicIpPrefixName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPPrefixesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.PublicIPPrefix>
+    public partial class ResourceNavigationLinksOperations
     {
-        internal PublicIPPrefixesCreateOrUpdateOperation() { }
+        protected ResourceNavigationLinksOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ResourceNavigationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ResourceNavigationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class RouteFilterRulesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.RouteFilterRule>
+    {
+        internal RouteFilterRulesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.PublicIPPrefix Value { get { throw null; } }
+        public override Azure.Management.Network.Models.RouteFilterRule Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.PublicIPPrefix>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PublicIPPrefixesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RouteFilterRulesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal PublicIPPrefixesDeleteOperation() { }
+        internal RouteFilterRulesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2382,15 +2414,9 @@ internal PublicIPPrefixesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceNavigationLinksClient
-    {
-        protected ResourceNavigationLinksClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ResourceNavigationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ResourceNavigationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class RouteFilterRulesClient
+    public partial class RouteFilterRulesOperations
     {
-        protected RouteFilterRulesClient() { }
+        protected RouteFilterRulesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.RouteFilterRule> Get(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.RouteFilterRule>> GetAsync(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.RouteFilterRule> ListByRouteFilter(string resourceGroupName, string routeFilterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2400,22 +2426,22 @@ protected RouteFilterRulesClient() { }
         public virtual Azure.Management.Network.RouteFilterRulesDeleteOperation StartDelete(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.RouteFilterRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string routeFilterName, string ruleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFilterRulesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.RouteFilterRule>
+    public partial class RouteFiltersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.RouteFilter>
     {
-        internal RouteFilterRulesCreateOrUpdateOperation() { }
+        internal RouteFiltersCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.RouteFilterRule Value { get { throw null; } }
+        public override Azure.Management.Network.Models.RouteFilter Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilterRule>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFilterRulesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RouteFiltersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RouteFilterRulesDeleteOperation() { }
+        internal RouteFiltersDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2426,9 +2452,9 @@ internal RouteFilterRulesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFiltersClient
+    public partial class RouteFiltersOperations
     {
-        protected RouteFiltersClient() { }
+        protected RouteFiltersOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.RouteFilter> Get(string resourceGroupName, string routeFilterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.RouteFilter>> GetAsync(string resourceGroupName, string routeFilterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.RouteFilter> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2442,22 +2468,22 @@ protected RouteFiltersClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.RouteFilter> UpdateTags(string resourceGroupName, string routeFilterName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.RouteFilter>> UpdateTagsAsync(string resourceGroupName, string routeFilterName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFiltersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.RouteFilter>
+    public partial class RoutesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.Route>
     {
-        internal RouteFiltersCreateOrUpdateOperation() { }
+        internal RoutesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.RouteFilter Value { get { throw null; } }
+        public override Azure.Management.Network.Models.Route Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteFilter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.Route>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.Route>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteFiltersDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RoutesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RouteFiltersDeleteOperation() { }
+        internal RoutesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2468,9 +2494,9 @@ internal RouteFiltersDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RoutesClient
+    public partial class RoutesOperations
     {
-        protected RoutesClient() { }
+        protected RoutesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.Route> Get(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.Route>> GetAsync(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.Route> List(string resourceGroupName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2480,22 +2506,22 @@ protected RoutesClient() { }
         public virtual Azure.Management.Network.RoutesDeleteOperation StartDelete(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.RoutesDeleteOperation> StartDeleteAsync(string resourceGroupName, string routeTableName, string routeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RoutesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.Route>
+    public partial class RouteTablesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.RouteTable>
     {
-        internal RoutesCreateOrUpdateOperation() { }
+        internal RouteTablesCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.Route Value { get { throw null; } }
+        public override Azure.Management.Network.Models.RouteTable Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.Route>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.Route>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteTable>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteTable>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RoutesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class RouteTablesDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RoutesDeleteOperation() { }
+        internal RouteTablesDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2506,9 +2532,9 @@ internal RoutesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteTablesClient
+    public partial class RouteTablesOperations
     {
-        protected RouteTablesClient() { }
+        protected RouteTablesOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.RouteTable> Get(string resourceGroupName, string routeTableName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.RouteTable>> GetAsync(string resourceGroupName, string routeTableName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.RouteTable> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2522,22 +2548,22 @@ protected RouteTablesClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.RouteTable> UpdateTags(string resourceGroupName, string routeTableName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.RouteTable>> UpdateTagsAsync(string resourceGroupName, string routeTableName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteTablesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.RouteTable>
+    public partial class SecurityPartnerProvidersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.SecurityPartnerProvider>
     {
-        internal RouteTablesCreateOrUpdateOperation() { }
+        internal SecurityPartnerProvidersCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.RouteTable Value { get { throw null; } }
+        public override Azure.Management.Network.Models.SecurityPartnerProvider Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteTable>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.RouteTable>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class RouteTablesDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class SecurityPartnerProvidersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal RouteTablesDeleteOperation() { }
+        internal SecurityPartnerProvidersDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2548,9 +2574,9 @@ internal RouteTablesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SecurityPartnerProvidersClient
+    public partial class SecurityPartnerProvidersOperations
     {
-        protected SecurityPartnerProvidersClient() { }
+        protected SecurityPartnerProvidersOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider> Get(string resourceGroupName, string securityPartnerProviderName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider>> GetAsync(string resourceGroupName, string securityPartnerProviderName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.SecurityPartnerProvider> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2564,44 +2590,6 @@ protected SecurityPartnerProvidersClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider> UpdateTags(string resourceGroupName, string securityPartnerProviderName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider>> UpdateTagsAsync(string resourceGroupName, string securityPartnerProviderName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SecurityPartnerProvidersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.SecurityPartnerProvider>
-    {
-        internal SecurityPartnerProvidersCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.SecurityPartnerProvider Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.SecurityPartnerProvider>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class SecurityPartnerProvidersDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal SecurityPartnerProvidersDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class SecurityRulesClient
-    {
-        protected SecurityRulesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.SecurityRule> List(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.SecurityRule> ListAsync(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.SecurityRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.Management.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SecurityRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.Management.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.SecurityRulesDeleteOperation StartDelete(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SecurityRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class SecurityRulesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.SecurityRule>
     {
         internal SecurityRulesCreateOrUpdateOperation() { }
@@ -2628,31 +2616,23 @@ internal SecurityRulesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceAssociationLinksClient
-    {
-        protected ServiceAssociationLinksClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ServiceAssociationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceAssociationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class ServiceClient
+    public partial class SecurityRulesOperations
     {
-        protected ServiceClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.DnsNameAvailabilityResult> CheckDnsNameAvailability(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DnsNameAvailabilityResult>> CheckDnsNameAvailabilityAsync(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionSessionState> DisconnectActiveSessions(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionSessionState> DisconnectActiveSessionsAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionShareableLink> GetBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionShareableLink> GetBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceDeleteBastionShareableLinkOperation StartDeleteBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceDeleteBastionShareableLinkOperation> StartDeleteBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation StartGeneratevirtualwanvpnserverconfigurationvpnprofile(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation> StartGeneratevirtualwanvpnserverconfigurationvpnprofileAsync(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceGetActiveSessionsOperation StartGetActiveSessions(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceGetActiveSessionsOperation> StartGetActiveSessionsAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServicePutBastionShareableLinkOperation StartPutBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServicePutBastionShareableLinkOperation> StartPutBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.VirtualWanSecurityProviders> SupportedSecurityProviders(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualWanSecurityProviders>> SupportedSecurityProvidersAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected SecurityRulesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.SecurityRule> Get(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.SecurityRule>> GetAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.SecurityRule> List(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.SecurityRule> ListAsync(string resourceGroupName, string networkSecurityGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.SecurityRulesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.Management.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SecurityRulesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, Azure.Management.Network.Models.SecurityRule securityRuleParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.SecurityRulesDeleteOperation StartDelete(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SecurityRulesDeleteOperation> StartDeleteAsync(string resourceGroupName, string networkSecurityGroupName, string securityRuleName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ServiceAssociationLinksOperations
+    {
+        protected ServiceAssociationLinksOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ServiceAssociationLinksListResult> List(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceAssociationLinksListResult>> ListAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ServiceDeleteBastionShareableLinkOperation : Azure.Operation<Azure.Response>
     {
@@ -2667,22 +2647,6 @@ internal ServiceDeleteBastionShareableLinkOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceEndpointPoliciesClient
-    {
-        protected ServiceEndpointPoliciesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy> Get(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ServiceEndpointPolicy> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ServiceEndpointPolicy> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ServiceEndpointPolicy> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ServiceEndpointPolicy> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceEndpointPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceEndpointPoliciesDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy> UpdateTags(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy>> UpdateTagsAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ServiceEndpointPoliciesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ServiceEndpointPolicy>
     {
         internal ServiceEndpointPoliciesCreateOrUpdateOperation() { }
@@ -2709,17 +2673,21 @@ internal ServiceEndpointPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceEndpointPolicyDefinitionsClient
+    public partial class ServiceEndpointPoliciesOperations
     {
-        protected ServiceEndpointPolicyDefinitionsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition> Get(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroup(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroupAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.Management.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.Management.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.ServiceEndpointPolicyDefinitionsDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPolicyDefinitionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected ServiceEndpointPoliciesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy> Get(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ServiceEndpointPolicy> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ServiceEndpointPolicy> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ServiceEndpointPolicy> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ServiceEndpointPolicy> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceEndpointPoliciesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPoliciesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.ServiceEndpointPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceEndpointPoliciesDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy> UpdateTags(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicy>> UpdateTagsAsync(string resourceGroupName, string serviceEndpointPolicyName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition>
     {
@@ -2747,6 +2715,18 @@ internal ServiceEndpointPolicyDefinitionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ServiceEndpointPolicyDefinitionsOperations
+    {
+        protected ServiceEndpointPolicyDefinitionsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition> Get(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition>> GetAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroup(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.ServiceEndpointPolicyDefinition> ListByResourceGroupAsync(string resourceGroupName, string serviceEndpointPolicyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.Management.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPolicyDefinitionsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, Azure.Management.Network.Models.ServiceEndpointPolicyDefinition serviceEndpointPolicyDefinitions, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceEndpointPolicyDefinitionsDeleteOperation StartDelete(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceEndpointPolicyDefinitionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string serviceEndpointPolicyName, string serviceEndpointPolicyDefinitionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation : Azure.Operation<Azure.Management.Network.Models.VpnProfileResponse>
     {
         internal ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation() { }
@@ -2773,6 +2753,26 @@ internal ServiceGetActiveSessionsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.BastionActiveSessionListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.BastionActiveSessionListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ServiceOperations
+    {
+        protected ServiceOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.DnsNameAvailabilityResult> CheckDnsNameAvailability(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.DnsNameAvailabilityResult>> CheckDnsNameAvailabilityAsync(string location, string domainNameLabel, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionSessionState> DisconnectActiveSessions(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionSessionState> DisconnectActiveSessionsAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.SessionIds sessionIds, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.BastionShareableLink> GetBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.BastionShareableLink> GetBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceDeleteBastionShareableLinkOperation StartDeleteBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceDeleteBastionShareableLinkOperation> StartDeleteBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation StartGeneratevirtualwanvpnserverconfigurationvpnprofile(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceGeneratevirtualwanvpnserverconfigurationvpnprofileOperation> StartGeneratevirtualwanvpnserverconfigurationvpnprofileAsync(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.VirtualWanVpnProfileParameters vpnClientParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServiceGetActiveSessionsOperation StartGetActiveSessions(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServiceGetActiveSessionsOperation> StartGetActiveSessionsAsync(string resourceGroupName, string bastionHostName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.ServicePutBastionShareableLinkOperation StartPutBastionShareableLink(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.ServicePutBastionShareableLinkOperation> StartPutBastionShareableLinkAsync(string resourceGroupName, string bastionHostName, Azure.Management.Network.Models.BastionShareableLinkListRequest bslRequest, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.VirtualWanSecurityProviders> SupportedSecurityProviders(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualWanSecurityProviders>> SupportedSecurityProvidersAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ServicePutBastionShareableLinkOperation : Azure.Operation<Azure.Management.Network.Models.BastionShareableLinkListResult>
     {
         internal ServicePutBastionShareableLinkOperation() { }
@@ -2786,28 +2786,12 @@ internal ServicePutBastionShareableLinkOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.BastionShareableLinkListResult>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.BastionShareableLinkListResult>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ServiceTagsClient
+    public partial class ServiceTagsOperations
     {
-        protected ServiceTagsClient() { }
+        protected ServiceTagsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.ServiceTagsListResult> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.ServiceTagsListResult>> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SubnetsClient
-    {
-        protected SubnetsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.Subnet> Get(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.Subnet>> GetAsync(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.Subnet> List(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.Subnet> ListAsync(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.SubnetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.SubnetsDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.SubnetsPrepareNetworkPoliciesOperation StartPrepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsPrepareNetworkPoliciesOperation> StartPrepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.SubnetsUnprepareNetworkPoliciesOperation StartUnprepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsUnprepareNetworkPoliciesOperation> StartUnprepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class SubnetsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.Subnet>
     {
         internal SubnetsCreateOrUpdateOperation() { }
@@ -2834,6 +2818,22 @@ internal SubnetsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class SubnetsOperations
+    {
+        protected SubnetsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.Subnet> Get(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.Subnet>> GetAsync(string resourceGroupName, string virtualNetworkName, string subnetName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.Subnet> List(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.Subnet> ListAsync(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.SubnetsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.Subnet subnetParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.SubnetsDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkName, string subnetName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.SubnetsPrepareNetworkPoliciesOperation StartPrepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsPrepareNetworkPoliciesOperation> StartPrepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.PrepareNetworkPoliciesRequest prepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.SubnetsUnprepareNetworkPoliciesOperation StartUnprepareNetworkPolicies(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.SubnetsUnprepareNetworkPoliciesOperation> StartUnprepareNetworkPoliciesAsync(string resourceGroupName, string virtualNetworkName, string subnetName, Azure.Management.Network.Models.UnprepareNetworkPoliciesRequest unprepareNetworkPoliciesRequestParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class SubnetsPrepareNetworkPoliciesOperation : Azure.Operation<Azure.Response>
     {
         internal SubnetsPrepareNetworkPoliciesOperation() { }
@@ -2860,15 +2860,41 @@ internal SubnetsUnprepareNetworkPoliciesOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
-        protected UsagesClient() { }
+        protected UsagesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.Usage> List(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.Usage> ListAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubRouteTableV2SClient
+    public partial class VirtualHubRouteTableV2SCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualHubRouteTableV2>
+    {
+        internal VirtualHubRouteTableV2SCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualHubRouteTableV2 Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualHubRouteTableV2SDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal VirtualHubRouteTableV2SDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualHubRouteTableV2SOperations
     {
-        protected VirtualHubRouteTableV2SClient() { }
+        protected VirtualHubRouteTableV2SOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualHubRouteTableV2> Get(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualHubRouteTableV2>> GetAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualHubRouteTableV2> List(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2878,22 +2904,22 @@ protected VirtualHubRouteTableV2SClient() { }
         public virtual Azure.Management.Network.VirtualHubRouteTableV2SDeleteOperation StartDelete(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualHubRouteTableV2SDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualHubName, string routeTableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubRouteTableV2SCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualHubRouteTableV2>
+    public partial class VirtualHubsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualHub>
     {
-        internal VirtualHubRouteTableV2SCreateOrUpdateOperation() { }
+        internal VirtualHubsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualHubRouteTableV2 Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualHub Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHubRouteTableV2>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHub>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHub>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubRouteTableV2SDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualHubsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualHubRouteTableV2SDeleteOperation() { }
+        internal VirtualHubsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2904,9 +2930,9 @@ internal VirtualHubRouteTableV2SDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubsClient
+    public partial class VirtualHubsOperations
     {
-        protected VirtualHubsClient() { }
+        protected VirtualHubsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualHub> Get(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualHub>> GetAsync(string resourceGroupName, string virtualHubName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualHub> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2920,22 +2946,22 @@ protected VirtualHubsClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualHub> UpdateTags(string resourceGroupName, string virtualHubName, Azure.Management.Network.Models.TagsObject virtualHubParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualHub>> UpdateTagsAsync(string resourceGroupName, string virtualHubName, Azure.Management.Network.Models.TagsObject virtualHubParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualHub>
+    public partial class VirtualNetworkGatewayConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>
     {
-        internal VirtualHubsCreateOrUpdateOperation() { }
+        internal VirtualNetworkGatewayConnectionsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualHub Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualNetworkGatewayConnection Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHub>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualHub>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualHubsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualNetworkGatewayConnectionsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualHubsDeleteOperation() { }
+        internal VirtualNetworkGatewayConnectionsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -2946,9 +2972,9 @@ internal VirtualHubsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkGatewayConnectionsClient
+    public partial class VirtualNetworkGatewayConnectionsOperations
     {
-        protected VirtualNetworkGatewayConnectionsClient() { }
+        protected VirtualNetworkGatewayConnectionsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection> Get(string resourceGroupName, string virtualNetworkGatewayConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> GetAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Network.Models.ConnectionSharedKey> GetSharedKey(string resourceGroupName, string virtualNetworkGatewayConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -2970,32 +2996,6 @@ protected VirtualNetworkGatewayConnectionsClient() { }
         public virtual Azure.Management.Network.VirtualNetworkGatewayConnectionsUpdateTagsOperation StartUpdateTags(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewayConnectionsUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkGatewayConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>
-    {
-        internal VirtualNetworkGatewayConnectionsCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualNetworkGatewayConnection Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VirtualNetworkGatewayConnectionsDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal VirtualNetworkGatewayConnectionsDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualNetworkGatewayConnectionsResetSharedKeyOperation : Azure.Operation<Azure.Management.Network.Models.ConnectionResetSharedKey>
     {
         internal VirtualNetworkGatewayConnectionsResetSharedKeyOperation() { }
@@ -3061,54 +3061,6 @@ internal VirtualNetworkGatewayConnectionsUpdateTagsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGatewayConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkGatewaysClient
-    {
-        protected VirtualNetworkGatewaysClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetworkGateway> Get(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGateway>> GetAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VirtualNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnections(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation StartDisconnectVirtualNetworkGatewayVpnConnections(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation> StartDisconnectVirtualNetworkGatewayVpnConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation StartGeneratevpnclientpackage(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation> StartGeneratevpnclientpackageAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation StartGetAdvertisedRoutes(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation> StartGetAdvertisedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation StartGetBgpPeerStatus(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation> StartGetBgpPeerStatusAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation StartGetLearnedRoutes(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation> StartGetLearnedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation StartGetVpnclientConnectionHealth(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation> StartGetVpnclientConnectionHealthAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation StartGetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation> StartGetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation StartGetVpnProfilePackageUrl(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation> StartGetVpnProfilePackageUrlAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysResetOperation StartReset(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysResetOperation> StartResetAsync(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation StartResetVpnClientSharedKey(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation> StartResetVpnClientSharedKeyAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation StartSetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation> StartSetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysStartPacketCaptureOperation StartStartPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysStartPacketCaptureOperation> StartStartPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysStopPacketCaptureOperation StartStopPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysStopPacketCaptureOperation> StartStopPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VirtualNetworkGatewaysUpdateTagsOperation StartUpdateTags(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> SupportedVpnDevices(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> SupportedVpnDevicesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<string> VpnDeviceConfigurationScript(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.Management.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<string>> VpnDeviceConfigurationScriptAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.Management.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VirtualNetworkGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkGateway>
     {
         internal VirtualNetworkGatewaysCreateOrUpdateOperation() { }
@@ -3252,6 +3204,54 @@ internal VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<string>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<string>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VirtualNetworkGatewaysOperations
+    {
+        protected VirtualNetworkGatewaysOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetworkGateway> Get(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGateway>> GetAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualNetworkGateway> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VirtualNetworkGateway> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnections(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VirtualNetworkGatewayConnectionListEntity> ListConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VirtualNetworkGateway parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation StartDisconnectVirtualNetworkGatewayVpnConnections(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysDisconnectVirtualNetworkGatewayVpnConnectionsOperation> StartDisconnectVirtualNetworkGatewayVpnConnectionsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.P2SVpnConnectionRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation StartGeneratevpnclientpackage(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGeneratevpnclientpackageOperation> StartGeneratevpnclientpackageAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation StartGenerateVpnProfile(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGenerateVpnProfileOperation> StartGenerateVpnProfileAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation StartGetAdvertisedRoutes(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetAdvertisedRoutesOperation> StartGetAdvertisedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation StartGetBgpPeerStatus(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetBgpPeerStatusOperation> StartGetBgpPeerStatusAsync(string resourceGroupName, string virtualNetworkGatewayName, string peer = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation StartGetLearnedRoutes(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetLearnedRoutesOperation> StartGetLearnedRoutesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation StartGetVpnclientConnectionHealth(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientConnectionHealthOperation> StartGetVpnclientConnectionHealthAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation StartGetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetVpnclientIpsecParametersOperation> StartGetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation StartGetVpnProfilePackageUrl(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysGetVpnProfilePackageUrlOperation> StartGetVpnProfilePackageUrlAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysResetOperation StartReset(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysResetOperation> StartResetAsync(string resourceGroupName, string virtualNetworkGatewayName, string gatewayVip = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation StartResetVpnClientSharedKey(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysResetVpnClientSharedKeyOperation> StartResetVpnClientSharedKeyAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation StartSetVpnclientIpsecParameters(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysSetVpnclientIpsecParametersOperation> StartSetVpnclientIpsecParametersAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnClientIPsecParameters vpnclientIpsecParams, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysStartPacketCaptureOperation StartStartPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysStartPacketCaptureOperation> StartStartPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStartParameters parameters = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysStopPacketCaptureOperation StartStopPacketCapture(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysStopPacketCaptureOperation> StartStopPacketCaptureAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.VpnPacketCaptureStopParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VirtualNetworkGatewaysUpdateTagsOperation StartUpdateTags(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkGatewaysUpdateTagsOperation> StartUpdateTagsAsync(string resourceGroupName, string virtualNetworkGatewayName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<string> SupportedVpnDevices(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<string>> SupportedVpnDevicesAsync(string resourceGroupName, string virtualNetworkGatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<string> VpnDeviceConfigurationScript(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.Management.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<string>> VpnDeviceConfigurationScriptAsync(string resourceGroupName, string virtualNetworkGatewayConnectionName, Azure.Management.Network.Models.VpnDeviceScriptParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VirtualNetworkGatewaysResetOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkGateway>
     {
         internal VirtualNetworkGatewaysResetOperation() { }
@@ -3330,9 +3330,35 @@ internal VirtualNetworkGatewaysUpdateTagsOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkPeeringsClient
+    public partial class VirtualNetworkPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkPeering>
+    {
+        internal VirtualNetworkPeeringsCreateOrUpdateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualNetworkPeering Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualNetworkPeeringsDeleteOperation : Azure.Operation<Azure.Response>
+    {
+        internal VirtualNetworkPeeringsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VirtualNetworkPeeringsOperations
     {
-        protected VirtualNetworkPeeringsClient() { }
+        protected VirtualNetworkPeeringsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetworkPeering> Get(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetworkPeering>> GetAsync(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualNetworkPeering> List(string resourceGroupName, string virtualNetworkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3342,22 +3368,22 @@ protected VirtualNetworkPeeringsClient() { }
         public virtual Azure.Management.Network.VirtualNetworkPeeringsDeleteOperation StartDelete(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualNetworkPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualNetworkName, string virtualNetworkPeeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkPeering>
+    public partial class VirtualNetworksCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetwork>
     {
-        internal VirtualNetworkPeeringsCreateOrUpdateOperation() { }
+        internal VirtualNetworksCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualNetworkPeering Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualNetwork Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkPeeringsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualNetworksDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualNetworkPeeringsDeleteOperation() { }
+        internal VirtualNetworksDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3368,9 +3394,9 @@ internal VirtualNetworkPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworksClient
+    public partial class VirtualNetworksOperations
     {
-        protected VirtualNetworksClient() { }
+        protected VirtualNetworksOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.IPAddressAvailabilityResult> CheckIPAddressAvailability(string resourceGroupName, string virtualNetworkName, string ipAddress, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.IPAddressAvailabilityResult>> CheckIPAddressAvailabilityAsync(string resourceGroupName, string virtualNetworkName, string ipAddress, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetwork> Get(string resourceGroupName, string virtualNetworkName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3388,22 +3414,22 @@ protected VirtualNetworksClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetwork> UpdateTags(string resourceGroupName, string virtualNetworkName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetwork>> UpdateTagsAsync(string resourceGroupName, string virtualNetworkName, Azure.Management.Network.Models.TagsObject parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworksCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetwork>
+    public partial class VirtualNetworkTapsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkTap>
     {
-        internal VirtualNetworksCreateOrUpdateOperation() { }
+        internal VirtualNetworkTapsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualNetwork Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualNetworkTap Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetwork>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworksDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualNetworkTapsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualNetworksDeleteOperation() { }
+        internal VirtualNetworkTapsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3414,9 +3440,9 @@ internal VirtualNetworksDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkTapsClient
+    public partial class VirtualNetworkTapsOperations
     {
-        protected VirtualNetworkTapsClient() { }
+        protected VirtualNetworkTapsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap> Get(string resourceGroupName, string tapName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap>> GetAsync(string resourceGroupName, string tapName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualNetworkTap> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3430,22 +3456,22 @@ protected VirtualNetworkTapsClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap> UpdateTags(string resourceGroupName, string tapName, Azure.Management.Network.Models.TagsObject tapParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap>> UpdateTagsAsync(string resourceGroupName, string tapName, Azure.Management.Network.Models.TagsObject tapParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkTapsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualNetworkTap>
+    public partial class VirtualRouterPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualRouterPeering>
     {
-        internal VirtualNetworkTapsCreateOrUpdateOperation() { }
+        internal VirtualRouterPeeringsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualNetworkTap Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualRouterPeering Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualNetworkTap>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualNetworkTapsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualRouterPeeringsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualNetworkTapsDeleteOperation() { }
+        internal VirtualRouterPeeringsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3456,9 +3482,9 @@ internal VirtualNetworkTapsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRouterPeeringsClient
+    public partial class VirtualRouterPeeringsOperations
     {
-        protected VirtualRouterPeeringsClient() { }
+        protected VirtualRouterPeeringsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualRouterPeering> Get(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualRouterPeering>> GetAsync(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualRouterPeering> List(string resourceGroupName, string virtualRouterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3468,22 +3494,22 @@ protected VirtualRouterPeeringsClient() { }
         public virtual Azure.Management.Network.VirtualRouterPeeringsDeleteOperation StartDelete(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualRouterPeeringsDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualRouterName, string peeringName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRouterPeeringsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualRouterPeering>
+    public partial class VirtualRoutersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualRouter>
     {
-        internal VirtualRouterPeeringsCreateOrUpdateOperation() { }
+        internal VirtualRoutersCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualRouterPeering Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualRouter Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouterPeering>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRouterPeeringsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualRoutersDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualRouterPeeringsDeleteOperation() { }
+        internal VirtualRoutersDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3494,9 +3520,9 @@ internal VirtualRouterPeeringsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRoutersClient
+    public partial class VirtualRoutersOperations
     {
-        protected VirtualRoutersClient() { }
+        protected VirtualRoutersOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualRouter> Get(string resourceGroupName, string virtualRouterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualRouter>> GetAsync(string resourceGroupName, string virtualRouterName, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualRouter> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3508,22 +3534,22 @@ protected VirtualRoutersClient() { }
         public virtual Azure.Management.Network.VirtualRoutersDeleteOperation StartDelete(string resourceGroupName, string virtualRouterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.VirtualRoutersDeleteOperation> StartDeleteAsync(string resourceGroupName, string virtualRouterName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRoutersCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualRouter>
+    public partial class VirtualWansCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualWAN>
     {
-        internal VirtualRoutersCreateOrUpdateOperation() { }
+        internal VirtualWansCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualRouter Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VirtualWAN Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualRouter>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualRoutersDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VirtualWansDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualRoutersDeleteOperation() { }
+        internal VirtualWansDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3534,9 +3560,9 @@ internal VirtualRoutersDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualWansClient
+    public partial class VirtualWansOperations
     {
-        protected VirtualWansClient() { }
+        protected VirtualWansOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualWAN> Get(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualWAN>> GetAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VirtualWAN> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3550,22 +3576,22 @@ protected VirtualWansClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VirtualWAN> UpdateTags(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.TagsObject wANParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VirtualWAN>> UpdateTagsAsync(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.TagsObject wANParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualWansCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VirtualWAN>
+    public partial class VpnConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VpnConnection>
     {
-        internal VirtualWansCreateOrUpdateOperation() { }
+        internal VpnConnectionsCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VirtualWAN Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VpnConnection Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VirtualWAN>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VirtualWansDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VpnConnectionsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VirtualWansDeleteOperation() { }
+        internal VpnConnectionsDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3576,9 +3602,9 @@ internal VirtualWansDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnConnectionsClient
+    public partial class VpnConnectionsOperations
     {
-        protected VpnConnectionsClient() { }
+        protected VpnConnectionsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VpnConnection> Get(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VpnConnection> ListByVpnGateway(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3588,22 +3614,22 @@ protected VpnConnectionsClient() { }
         public virtual Azure.Management.Network.VpnConnectionsDeleteOperation StartDelete(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnConnectionsDeleteOperation> StartDeleteAsync(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnConnectionsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VpnConnection>
+    public partial class VpnGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VpnGateway>
     {
-        internal VpnConnectionsCreateOrUpdateOperation() { }
+        internal VpnGatewaysCreateOrUpdateOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VpnConnection Value { get { throw null; } }
+        public override Azure.Management.Network.Models.VpnGateway Value { get { throw null; } }
         public override Azure.Response GetRawResponse() { throw null; }
         public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnConnection>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnConnection>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnConnectionsDeleteOperation : Azure.Operation<Azure.Response>
+    public partial class VpnGatewaysDeleteOperation : Azure.Operation<Azure.Response>
     {
-        internal VpnConnectionsDeleteOperation() { }
+        internal VpnGatewaysDeleteOperation() { }
         public override bool HasCompleted { get { throw null; } }
         public override bool HasValue { get { throw null; } }
         public override string Id { get { throw null; } }
@@ -3614,9 +3640,9 @@ internal VpnConnectionsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnGatewaysClient
+    public partial class VpnGatewaysOperations
     {
-        protected VpnGatewaysClient() { }
+        protected VpnGatewaysOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VpnGateway> Get(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnGateway>> GetAsync(string resourceGroupName, string gatewayName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VpnGateway> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -3632,32 +3658,6 @@ protected VpnGatewaysClient() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VpnGateway> UpdateTags(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.TagsObject vpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnGateway>> UpdateTagsAsync(string resourceGroupName, string gatewayName, Azure.Management.Network.Models.TagsObject vpnGatewayParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnGatewaysCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VpnGateway>
-    {
-        internal VpnGatewaysCreateOrUpdateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Network.Models.VpnGateway Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VpnGatewaysDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal VpnGatewaysDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VpnGatewaysResetOperation : Azure.Operation<Azure.Management.Network.Models.VpnGateway>
     {
         internal VpnGatewaysResetOperation() { }
@@ -3671,18 +3671,12 @@ internal VpnGatewaysResetOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnGateway>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnGateway>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnLinkConnectionsClient
+    public partial class VpnLinkConnectionsOperations
     {
-        protected VpnLinkConnectionsClient() { }
+        protected VpnLinkConnectionsOperations() { }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VpnSiteLinkConnection> ListByVpnConnection(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnSiteLinkConnection> ListByVpnConnectionAsync(string resourceGroupName, string gatewayName, string connectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnServerConfigurationsAssociatedWithVirtualWanClient
-    {
-        protected VpnServerConfigurationsAssociatedWithVirtualWanClient() { }
-        public virtual Azure.Management.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation StartList(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation> StartListAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VpnServerConfigurationsAssociatedWithVirtualWanListOperation : Azure.Operation<Azure.Management.Network.Models.VpnServerConfigurationsResponse>
     {
         internal VpnServerConfigurationsAssociatedWithVirtualWanListOperation() { }
@@ -3696,21 +3690,11 @@ internal VpnServerConfigurationsAssociatedWithVirtualWanListOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnServerConfigurationsResponse>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Network.Models.VpnServerConfigurationsResponse>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnServerConfigurationsClient
+    public partial class VpnServerConfigurationsAssociatedWithVirtualWanOperations
     {
-        protected VpnServerConfigurationsClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration> Get(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration>> GetAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnServerConfiguration> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnServerConfiguration> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnServerConfiguration> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnServerConfiguration> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VpnServerConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnServerConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VpnServerConfigurationsDeleteOperation StartDelete(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnServerConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration> UpdateTags(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration>> UpdateTagsAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected VpnServerConfigurationsAssociatedWithVirtualWanOperations() { }
+        public virtual Azure.Management.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation StartList(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnServerConfigurationsAssociatedWithVirtualWanListOperation> StartListAsync(string resourceGroupName, string virtualWANName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class VpnServerConfigurationsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VpnServerConfiguration>
     {
@@ -3738,42 +3722,36 @@ internal VpnServerConfigurationsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnSiteLinkConnectionsClient
+    public partial class VpnServerConfigurationsOperations
+    {
+        protected VpnServerConfigurationsOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration> Get(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration>> GetAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnServerConfiguration> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnServerConfiguration> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnServerConfiguration> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnServerConfiguration> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VpnServerConfigurationsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnServerConfigurationsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.VpnServerConfiguration vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VpnServerConfigurationsDeleteOperation StartDelete(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnServerConfigurationsDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnServerConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration> UpdateTags(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnServerConfiguration>> UpdateTagsAsync(string resourceGroupName, string vpnServerConfigurationName, Azure.Management.Network.Models.TagsObject vpnServerConfigurationParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class VpnSiteLinkConnectionsOperations
     {
-        protected VpnSiteLinkConnectionsClient() { }
+        protected VpnSiteLinkConnectionsOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VpnSiteLinkConnection> Get(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnSiteLinkConnection>> GetAsync(string resourceGroupName, string gatewayName, string connectionName, string linkConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnSiteLinksClient
+    public partial class VpnSiteLinksOperations
     {
-        protected VpnSiteLinksClient() { }
+        protected VpnSiteLinksOperations() { }
         public virtual Azure.Response<Azure.Management.Network.Models.VpnSiteLink> Get(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnSiteLink>> GetAsync(string resourceGroupName, string vpnSiteName, string vpnSiteLinkName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Network.Models.VpnSiteLink> ListByVpnSite(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnSiteLink> ListByVpnSiteAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class VpnSitesClient
-    {
-        protected VpnSitesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.VpnSite> Get(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnSite>> GetAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnSite> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnSite> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnSite> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnSite> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VpnSitesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnSitesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.VpnSitesDeleteOperation StartDelete(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnSitesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.VpnSite> UpdateTags(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnSite>> UpdateTagsAsync(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class VpnSitesConfigurationClient
-    {
-        protected VpnSitesConfigurationClient() { }
-        public virtual Azure.Management.Network.VpnSitesConfigurationDownloadOperation StartDownload(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnSitesConfigurationDownloadOperation> StartDownloadAsync(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class VpnSitesConfigurationDownloadOperation : Azure.Operation<Azure.Response>
     {
         internal VpnSitesConfigurationDownloadOperation() { }
@@ -3787,6 +3765,12 @@ internal VpnSitesConfigurationDownloadOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class VpnSitesConfigurationOperations
+    {
+        protected VpnSitesConfigurationOperations() { }
+        public virtual Azure.Management.Network.VpnSitesConfigurationDownloadOperation StartDownload(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnSitesConfigurationDownloadOperation> StartDownloadAsync(string resourceGroupName, string virtualWANName, Azure.Management.Network.Models.GetVpnSitesConfigurationRequest request, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class VpnSitesCreateOrUpdateOperation : Azure.Operation<Azure.Management.Network.Models.VpnSite>
     {
         internal VpnSitesCreateOrUpdateOperation() { }
@@ -3813,19 +3797,21 @@ internal VpnSitesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class WebApplicationFirewallPoliciesClient
+    public partial class VpnSitesOperations
     {
-        protected WebApplicationFirewallPoliciesClient() { }
-        public virtual Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy> CreateOrUpdate(string resourceGroupName, string policyName, Azure.Management.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy>> CreateOrUpdateAsync(string resourceGroupName, string policyName, Azure.Management.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy> Get(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy>> GetAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Network.WebApplicationFirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Network.WebApplicationFirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        protected VpnSitesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.VpnSite> Get(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnSite>> GetAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnSite> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnSite> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.VpnSite> ListByResourceGroup(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.VpnSite> ListByResourceGroupAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VpnSitesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnSitesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.VpnSite vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.VpnSitesDeleteOperation StartDelete(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.VpnSitesDeleteOperation> StartDeleteAsync(string resourceGroupName, string vpnSiteName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.VpnSite> UpdateTags(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.VpnSite>> UpdateTagsAsync(string resourceGroupName, string vpnSiteName, Azure.Management.Network.Models.TagsObject vpnSiteParameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
     public partial class WebApplicationFirewallPoliciesDeleteOperation : Azure.Operation<Azure.Response>
     {
@@ -3840,6 +3826,20 @@ internal WebApplicationFirewallPoliciesDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class WebApplicationFirewallPoliciesOperations
+    {
+        protected WebApplicationFirewallPoliciesOperations() { }
+        public virtual Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy> CreateOrUpdate(string resourceGroupName, string policyName, Azure.Management.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy>> CreateOrUpdateAsync(string resourceGroupName, string policyName, Azure.Management.Network.Models.WebApplicationFirewallPolicy parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy> Get(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Network.Models.WebApplicationFirewallPolicy>> GetAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> List(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> ListAll(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> ListAllAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Network.Models.WebApplicationFirewallPolicy> ListAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Network.WebApplicationFirewallPoliciesDeleteOperation StartDelete(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Network.WebApplicationFirewallPoliciesDeleteOperation> StartDeleteAsync(string resourceGroupName, string policyName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
 }
 namespace Azure.Management.Network.Models
 {
diff --git a/sdk/testcommon/Azure.Management.Resources.2017_05/api/Azure.Management.Resources.netstandard2.0.cs b/sdk/testcommon/Azure.Management.Resources.2017_05/api/Azure.Management.Resources.netstandard2.0.cs
index ac0f9bfdf6d8b..58372a56c2856 100644
--- a/sdk/testcommon/Azure.Management.Resources.2017_05/api/Azure.Management.Resources.netstandard2.0.cs
+++ b/sdk/testcommon/Azure.Management.Resources.2017_05/api/Azure.Management.Resources.netstandard2.0.cs
@@ -1,35 +1,13 @@
 namespace Azure.Management.Resources
 {
-    public partial class DeploymentClient
+    public partial class DeploymentOperations
     {
-        protected DeploymentClient() { }
+        protected DeploymentOperations() { }
         public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentOperation> Get(string resourceGroupName, string deploymentName, string operationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentOperation>> GetAsync(string resourceGroupName, string deploymentName, string operationId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Resources.Models.DeploymentOperation> List(string resourceGroupName, string deploymentName, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.DeploymentOperation> ListAsync(string resourceGroupName, string deploymentName, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class DeploymentsClient
-    {
-        protected DeploymentsClient() { }
-        public virtual Azure.Response<Azure.Management.Resources.Models.TemplateHashResult> CalculateTemplateHash(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.TemplateHashResult>> CalculateTemplateHashAsync(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response Cancel(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistence(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentExportResult> ExportTemplate(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentExportResult>> ExportTemplateAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentExtended> Get(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentExtended>> GetAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Resources.Models.DeploymentExtended> ListByResourceGroup(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.DeploymentExtended> ListByResourceGroupAsync(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.DeploymentsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.DeploymentsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.DeploymentsDeleteOperation StartDelete(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.DeploymentsDeleteOperation> StartDeleteAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentValidateResult> Validate(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentValidateResult>> ValidateAsync(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class DeploymentsCreateOrUpdateOperation : Azure.Operation<Azure.Management.Resources.Models.DeploymentExtended>
     {
         internal DeploymentsCreateOrUpdateOperation() { }
@@ -56,9 +34,31 @@ internal DeploymentsDeleteOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ProvidersClient
+    public partial class DeploymentsOperations
     {
-        protected ProvidersClient() { }
+        protected DeploymentsOperations() { }
+        public virtual Azure.Response<Azure.Management.Resources.Models.TemplateHashResult> CalculateTemplateHash(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.TemplateHashResult>> CalculateTemplateHashAsync(object template, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response Cancel(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CancelAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistence(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentExportResult> ExportTemplate(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentExportResult>> ExportTemplateAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentExtended> Get(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentExtended>> GetAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Resources.Models.DeploymentExtended> ListByResourceGroup(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.DeploymentExtended> ListByResourceGroupAsync(string resourceGroupName, string filter = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.DeploymentsCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.DeploymentsCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.DeploymentsDeleteOperation StartDelete(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.DeploymentsDeleteOperation> StartDeleteAsync(string resourceGroupName, string deploymentName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Resources.Models.DeploymentValidateResult> Validate(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.DeploymentValidateResult>> ValidateAsync(string resourceGroupName, string deploymentName, Azure.Management.Resources.Models.Deployment parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ProvidersOperations
+    {
+        protected ProvidersOperations() { }
         public virtual Azure.Response<Azure.Management.Resources.Models.Provider> Get(string resourceProviderNamespace, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.Provider>> GetAsync(string resourceProviderNamespace, string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Resources.Models.Provider> List(int? top = default(int?), string expand = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -68,9 +68,22 @@ protected ProvidersClient() { }
         public virtual Azure.Response<Azure.Management.Resources.Models.Provider> Unregister(string resourceProviderNamespace, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.Provider>> UnregisterAsync(string resourceProviderNamespace, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceGroupsClient
+    public partial class ResourceGroupsDeleteOperation : Azure.Operation<Azure.Response>
     {
-        protected ResourceGroupsClient() { }
+        internal ResourceGroupsDeleteOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class ResourceGroupsOperations
+    {
+        protected ResourceGroupsOperations() { }
         public virtual Azure.Response CheckExistence(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Resources.Models.ResourceGroup> CreateOrUpdate(string resourceGroupName, Azure.Management.Resources.Models.ResourceGroup parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -86,51 +99,6 @@ protected ResourceGroupsClient() { }
         public virtual Azure.Response<Azure.Management.Resources.Models.ResourceGroup> Update(string resourceGroupName, Azure.Management.Resources.Models.ResourceGroupPatchable parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.ResourceGroup>> UpdateAsync(string resourceGroupName, Azure.Management.Resources.Models.ResourceGroupPatchable parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ResourceGroupsDeleteOperation : Azure.Operation<Azure.Response>
-    {
-        internal ResourceGroupsDeleteOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class ResourcesClient
-    {
-        protected ResourcesClient() { }
-        public virtual Azure.Response CheckExistence(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response CheckExistenceById(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceByIdAsync(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Resources.Models.GenericResource> Get(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.GenericResource>> GetAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Response<Azure.Management.Resources.Models.GenericResource> GetById(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.GenericResource>> GetByIdAsync(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Resources.Models.GenericResourceExpanded> List(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.GenericResourceExpanded> ListAsync(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Pageable<Azure.Management.Resources.Models.GenericResourceExpanded> ListByResourceGroup(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.GenericResourceExpanded> ListByResourceGroupAsync(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesCreateOrUpdateByIdOperation StartCreateOrUpdateById(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesDeleteOperation StartDelete(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesDeleteOperation> StartDeleteAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesDeleteByIdOperation StartDeleteById(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesDeleteByIdOperation> StartDeleteByIdAsync(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesMoveResourcesOperation StartMoveResources(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesMoveResourcesOperation> StartMoveResourcesAsync(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesUpdateOperation StartUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesUpdateOperation> StartUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesUpdateByIdOperation StartUpdateById(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesUpdateByIdOperation> StartUpdateByIdAsync(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual Azure.Management.Resources.ResourcesValidateMoveResourcesOperation StartValidateMoveResources(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesValidateMoveResourcesOperation> StartValidateMoveResourcesAsync(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class ResourcesCreateOrUpdateByIdOperation : Azure.Operation<Azure.Management.Resources.Models.GenericResource>
     {
         internal ResourcesCreateOrUpdateByIdOperation() { }
@@ -188,12 +156,12 @@ public partial class ResourcesManagementClient
         protected ResourcesManagementClient() { }
         public ResourcesManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.Management.Resources.ResourcesManagementClientOptions options = null) { }
         public ResourcesManagementClient(string subscriptionId, System.Uri endpoint, Azure.Core.TokenCredential tokenCredential, Azure.Management.Resources.ResourcesManagementClientOptions options = null) { }
-        public virtual Azure.Management.Resources.DeploymentClient GetDeploymentClient() { throw null; }
-        public virtual Azure.Management.Resources.DeploymentsClient GetDeploymentsClient() { throw null; }
-        public virtual Azure.Management.Resources.ProvidersClient GetProvidersClient() { throw null; }
-        public virtual Azure.Management.Resources.ResourceGroupsClient GetResourceGroupsClient() { throw null; }
-        public virtual Azure.Management.Resources.ResourcesClient GetResourcesClient() { throw null; }
-        public virtual Azure.Management.Resources.TagsClient GetTagsClient() { throw null; }
+        public virtual Azure.Management.Resources.DeploymentOperations Deployment { get { throw null; } }
+        public virtual Azure.Management.Resources.DeploymentsOperations Deployments { get { throw null; } }
+        public virtual Azure.Management.Resources.ProvidersOperations Providers { get { throw null; } }
+        public virtual Azure.Management.Resources.ResourceGroupsOperations ResourceGroups { get { throw null; } }
+        public virtual Azure.Management.Resources.ResourcesOperations Resources { get { throw null; } }
+        public virtual Azure.Management.Resources.TagsOperations Tags { get { throw null; } }
     }
     public partial class ResourcesManagementClientOptions : Azure.Core.ClientOptions
     {
@@ -212,6 +180,38 @@ internal ResourcesMoveResourcesOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
+    public partial class ResourcesOperations
+    {
+        protected ResourcesOperations() { }
+        public virtual Azure.Response CheckExistence(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response CheckExistenceById(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response> CheckExistenceByIdAsync(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Resources.Models.GenericResource> Get(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.GenericResource>> GetAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Response<Azure.Management.Resources.Models.GenericResource> GetById(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.GenericResource>> GetByIdAsync(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Resources.Models.GenericResourceExpanded> List(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.GenericResourceExpanded> ListAsync(string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Pageable<Azure.Management.Resources.Models.GenericResourceExpanded> ListByResourceGroup(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.AsyncPageable<Azure.Management.Resources.Models.GenericResourceExpanded> ListByResourceGroupAsync(string resourceGroupName, string filter = null, string expand = null, int? top = default(int?), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesCreateOrUpdateOperation StartCreateOrUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesCreateOrUpdateOperation> StartCreateOrUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesCreateOrUpdateByIdOperation StartCreateOrUpdateById(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesCreateOrUpdateByIdOperation> StartCreateOrUpdateByIdAsync(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesDeleteOperation StartDelete(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesDeleteOperation> StartDeleteAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesDeleteByIdOperation StartDeleteById(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesDeleteByIdOperation> StartDeleteByIdAsync(string resourceId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesMoveResourcesOperation StartMoveResources(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesMoveResourcesOperation> StartMoveResourcesAsync(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesUpdateOperation StartUpdate(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesUpdateOperation> StartUpdateAsync(string resourceGroupName, string resourceProviderNamespace, string parentResourcePath, string resourceType, string resourceName, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesUpdateByIdOperation StartUpdateById(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesUpdateByIdOperation> StartUpdateByIdAsync(string resourceId, Azure.Management.Resources.Models.GenericResource parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual Azure.Management.Resources.ResourcesValidateMoveResourcesOperation StartValidateMoveResources(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public virtual System.Threading.Tasks.Task<Azure.Management.Resources.ResourcesValidateMoveResourcesOperation> StartValidateMoveResourcesAsync(string sourceResourceGroupName, Azure.Management.Resources.Models.ResourcesMoveInfo parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
     public partial class ResourcesUpdateByIdOperation : Azure.Operation<Azure.Management.Resources.Models.GenericResource>
     {
         internal ResourcesUpdateByIdOperation() { }
@@ -251,9 +251,9 @@ internal ResourcesValidateMoveResourcesOperation() { }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class TagsClient
+    public partial class TagsOperations
     {
-        protected TagsClient() { }
+        protected TagsOperations() { }
         public virtual Azure.Response<Azure.Management.Resources.Models.TagDetails> CreateOrUpdate(string tagName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Resources.Models.TagDetails>> CreateOrUpdateAsync(string tagName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Resources.Models.TagValue> CreateOrUpdateValue(string tagName, string tagValue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
diff --git a/sdk/testcommon/Azure.Management.Storage.2019_06/api/Azure.Management.Storage.netstandard2.0.cs b/sdk/testcommon/Azure.Management.Storage.2019_06/api/Azure.Management.Storage.netstandard2.0.cs
index df386b7312d52..a8008ce1077d2 100644
--- a/sdk/testcommon/Azure.Management.Storage.2019_06/api/Azure.Management.Storage.netstandard2.0.cs
+++ b/sdk/testcommon/Azure.Management.Storage.2019_06/api/Azure.Management.Storage.netstandard2.0.cs
@@ -1,8 +1,8 @@
 namespace Azure.Management.Storage
 {
-    public partial class BlobContainersClient
+    public partial class BlobContainersOperations
     {
-        protected BlobContainersClient() { }
+        protected BlobContainersOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.LegalHold> ClearLegalHold(string resourceGroupName, string accountName, string containerName, Azure.Management.Storage.Models.LegalHold legalHold, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.LegalHold>> ClearLegalHoldAsync(string resourceGroupName, string accountName, string containerName, Azure.Management.Storage.Models.LegalHold legalHold, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Storage.Models.BlobContainer> Create(string resourceGroupName, string accountName, string containerName, Azure.Management.Storage.Models.BlobContainer blobContainer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -30,9 +30,9 @@ protected BlobContainersClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.BlobContainer> Update(string resourceGroupName, string accountName, string containerName, Azure.Management.Storage.Models.BlobContainer blobContainer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.BlobContainer>> UpdateAsync(string resourceGroupName, string accountName, string containerName, Azure.Management.Storage.Models.BlobContainer blobContainer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class BlobServicesClient
+    public partial class BlobServicesOperations
     {
-        protected BlobServicesClient() { }
+        protected BlobServicesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.BlobServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.BlobServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Storage.Models.BlobServiceProperties> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -40,9 +40,9 @@ protected BlobServicesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.BlobServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.Management.Storage.Models.BlobServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.BlobServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.Management.Storage.Models.BlobServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class EncryptionScopesClient
+    public partial class EncryptionScopesOperations
     {
-        protected EncryptionScopesClient() { }
+        protected EncryptionScopesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.EncryptionScope> Get(string resourceGroupName, string accountName, string encryptionScopeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.EncryptionScope>> GetAsync(string resourceGroupName, string accountName, string encryptionScopeName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Pageable<Azure.Management.Storage.Models.EncryptionScope> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -52,9 +52,9 @@ protected EncryptionScopesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.EncryptionScope> Put(string resourceGroupName, string accountName, string encryptionScopeName, Azure.Management.Storage.Models.EncryptionScope encryptionScope, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.EncryptionScope>> PutAsync(string resourceGroupName, string accountName, string encryptionScopeName, Azure.Management.Storage.Models.EncryptionScope encryptionScope, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FileServicesClient
+    public partial class FileServicesOperations
     {
-        protected FileServicesClient() { }
+        protected FileServicesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.FileServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.FileServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Storage.Models.FileServiceItems> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -62,9 +62,9 @@ protected FileServicesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.FileServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.Management.Storage.Models.FileServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.FileServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.Management.Storage.Models.FileServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class FileSharesClient
+    public partial class FileSharesOperations
     {
-        protected FileSharesClient() { }
+        protected FileSharesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.FileShare> Create(string resourceGroupName, string accountName, string shareName, Azure.Management.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.FileShare>> CreateAsync(string resourceGroupName, string accountName, string shareName, Azure.Management.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string shareName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -78,9 +78,9 @@ protected FileSharesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.FileShare> Update(string resourceGroupName, string accountName, string shareName, Azure.Management.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.FileShare>> UpdateAsync(string resourceGroupName, string accountName, string shareName, Azure.Management.Storage.Models.FileShare fileShare, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ManagementPoliciesClient
+    public partial class ManagementPoliciesOperations
     {
-        protected ManagementPoliciesClient() { }
+        protected ManagementPoliciesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.ManagementPolicy> CreateOrUpdate(string resourceGroupName, string accountName, Azure.Management.Storage.Models.ManagementPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.ManagementPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, Azure.Management.Storage.Models.ManagementPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -88,9 +88,9 @@ protected ManagementPoliciesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.ManagementPolicy> Get(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.ManagementPolicy>> GetAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class ObjectReplicationPoliciesClient
+    public partial class ObjectReplicationPoliciesOperations
     {
-        protected ObjectReplicationPoliciesClient() { }
+        protected ObjectReplicationPoliciesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.ObjectReplicationPolicy> CreateOrUpdate(string resourceGroupName, string accountName, string objectReplicationPolicyId, Azure.Management.Storage.Models.ObjectReplicationPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.ObjectReplicationPolicy>> CreateOrUpdateAsync(string resourceGroupName, string accountName, string objectReplicationPolicyId, Azure.Management.Storage.Models.ObjectReplicationPolicy properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string objectReplicationPolicyId, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -100,15 +100,15 @@ protected ObjectReplicationPoliciesClient() { }
         public virtual Azure.Pageable<Azure.Management.Storage.Models.ObjectReplicationPolicy> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Storage.Models.ObjectReplicationPolicy> ListAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class OperationsClient
+    public partial class Operations
     {
-        protected OperationsClient() { }
+        protected Operations() { }
         public virtual Azure.Pageable<Azure.Management.Storage.Models.Operation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Storage.Models.Operation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateEndpointConnectionsClient
+    public partial class PrivateEndpointConnectionsOperations
     {
-        protected PrivateEndpointConnectionsClient() { }
+        protected PrivateEndpointConnectionsOperations() { }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response> DeleteAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Storage.Models.PrivateEndpointConnection> Get(string resourceGroupName, string accountName, string privateEndpointConnectionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -118,15 +118,15 @@ protected PrivateEndpointConnectionsClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.PrivateEndpointConnection> Put(string resourceGroupName, string accountName, string privateEndpointConnectionName, Azure.Management.Storage.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.PrivateEndpointConnection>> PutAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, Azure.Management.Storage.Models.PrivateEndpointConnection properties, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class PrivateLinkResourcesClient
+    public partial class PrivateLinkResourcesOperations
     {
-        protected PrivateLinkResourcesClient() { }
+        protected PrivateLinkResourcesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.PrivateLinkResourceListResult> ListByStorageAccount(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.PrivateLinkResourceListResult>> ListByStorageAccountAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class QueueClient
+    public partial class QueueOperations
     {
-        protected QueueClient() { }
+        protected QueueOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.StorageQueue> Create(string resourceGroupName, string accountName, string queueName, Azure.Management.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.StorageQueue>> CreateAsync(string resourceGroupName, string accountName, string queueName, Azure.Management.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string queueName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -138,9 +138,9 @@ protected QueueClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.StorageQueue> Update(string resourceGroupName, string accountName, string queueName, Azure.Management.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.StorageQueue>> UpdateAsync(string resourceGroupName, string accountName, string queueName, Azure.Management.Storage.Models.StorageQueue queue, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class QueueServicesClient
+    public partial class QueueServicesOperations
     {
-        protected QueueServicesClient() { }
+        protected QueueServicesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.QueueServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.QueueServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Storage.Models.ListQueueServices> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -148,15 +148,41 @@ protected QueueServicesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.QueueServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.Management.Storage.Models.QueueServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.QueueServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.Management.Storage.Models.QueueServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class SkusClient
+    public partial class SkusOperations
     {
-        protected SkusClient() { }
+        protected SkusOperations() { }
         public virtual Azure.Pageable<Azure.Management.Storage.Models.SkuInformation> List(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Storage.Models.SkuInformation> ListAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class StorageAccountsClient
+    public partial class StorageAccountsCreateOperation : Azure.Operation<Azure.Management.Storage.Models.StorageAccount>
+    {
+        internal StorageAccountsCreateOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Management.Storage.Models.StorageAccount Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class StorageAccountsFailoverOperation : Azure.Operation<Azure.Response>
+    {
+        internal StorageAccountsFailoverOperation() { }
+        public override bool HasCompleted { get { throw null; } }
+        public override bool HasValue { get { throw null; } }
+        public override string Id { get { throw null; } }
+        public override Azure.Response Value { get { throw null; } }
+        public override Azure.Response GetRawResponse() { throw null; }
+        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+    }
+    public partial class StorageAccountsOperations
     {
-        protected StorageAccountsClient() { }
+        protected StorageAccountsOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.CheckNameAvailabilityResult> CheckNameAvailability(Azure.Management.Storage.Models.StorageAccountCheckNameAvailabilityParameters accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.CheckNameAvailabilityResult>> CheckNameAvailabilityAsync(Azure.Management.Storage.Models.StorageAccountCheckNameAvailabilityParameters accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -186,32 +212,6 @@ protected StorageAccountsClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.StorageAccount> Update(string resourceGroupName, string accountName, Azure.Management.Storage.Models.StorageAccountUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.StorageAccount>> UpdateAsync(string resourceGroupName, string accountName, Azure.Management.Storage.Models.StorageAccountUpdateParameters parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class StorageAccountsCreateOperation : Azure.Operation<Azure.Management.Storage.Models.StorageAccount>
-    {
-        internal StorageAccountsCreateOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Management.Storage.Models.StorageAccount Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Management.Storage.Models.StorageAccount>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
-    public partial class StorageAccountsFailoverOperation : Azure.Operation<Azure.Response>
-    {
-        internal StorageAccountsFailoverOperation() { }
-        public override bool HasCompleted { get { throw null; } }
-        public override bool HasValue { get { throw null; } }
-        public override string Id { get { throw null; } }
-        public override Azure.Response Value { get { throw null; } }
-        public override Azure.Response GetRawResponse() { throw null; }
-        public override Azure.Response UpdateStatus(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response> UpdateStatusAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-        public override System.Threading.Tasks.ValueTask<Azure.Response<Azure.Response>> WaitForCompletionAsync(System.TimeSpan pollingInterval, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
-    }
     public partial class StorageAccountsRestoreBlobRangesOperation : Azure.Operation<Azure.Management.Storage.Models.BlobRestoreStatus>
     {
         internal StorageAccountsRestoreBlobRangesOperation() { }
@@ -230,31 +230,31 @@ public partial class StorageManagementClient
         protected StorageManagementClient() { }
         public StorageManagementClient(string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.Management.Storage.StorageManagementClientOptions options = null) { }
         public StorageManagementClient(System.Uri endpoint, string subscriptionId, Azure.Core.TokenCredential tokenCredential, Azure.Management.Storage.StorageManagementClientOptions options = null) { }
-        public virtual Azure.Management.Storage.BlobContainersClient GetBlobContainersClient() { throw null; }
-        public virtual Azure.Management.Storage.BlobServicesClient GetBlobServicesClient() { throw null; }
-        public virtual Azure.Management.Storage.EncryptionScopesClient GetEncryptionScopesClient() { throw null; }
-        public virtual Azure.Management.Storage.FileServicesClient GetFileServicesClient() { throw null; }
-        public virtual Azure.Management.Storage.FileSharesClient GetFileSharesClient() { throw null; }
-        public virtual Azure.Management.Storage.ManagementPoliciesClient GetManagementPoliciesClient() { throw null; }
-        public virtual Azure.Management.Storage.ObjectReplicationPoliciesClient GetObjectReplicationPoliciesClient() { throw null; }
-        public virtual Azure.Management.Storage.OperationsClient GetOperationsClient() { throw null; }
-        public virtual Azure.Management.Storage.PrivateEndpointConnectionsClient GetPrivateEndpointConnectionsClient() { throw null; }
-        public virtual Azure.Management.Storage.PrivateLinkResourcesClient GetPrivateLinkResourcesClient() { throw null; }
-        public virtual Azure.Management.Storage.QueueClient GetQueueClient() { throw null; }
-        public virtual Azure.Management.Storage.QueueServicesClient GetQueueServicesClient() { throw null; }
-        public virtual Azure.Management.Storage.SkusClient GetSkusClient() { throw null; }
-        public virtual Azure.Management.Storage.StorageAccountsClient GetStorageAccountsClient() { throw null; }
-        public virtual Azure.Management.Storage.TableClient GetTableClient() { throw null; }
-        public virtual Azure.Management.Storage.TableServicesClient GetTableServicesClient() { throw null; }
-        public virtual Azure.Management.Storage.UsagesClient GetUsagesClient() { throw null; }
+        public virtual Azure.Management.Storage.BlobContainersOperations BlobContainers { get { throw null; } }
+        public virtual Azure.Management.Storage.BlobServicesOperations BlobServices { get { throw null; } }
+        public virtual Azure.Management.Storage.EncryptionScopesOperations EncryptionScopes { get { throw null; } }
+        public virtual Azure.Management.Storage.FileServicesOperations FileServices { get { throw null; } }
+        public virtual Azure.Management.Storage.FileSharesOperations FileShares { get { throw null; } }
+        public virtual Azure.Management.Storage.ManagementPoliciesOperations ManagementPolicies { get { throw null; } }
+        public virtual Azure.Management.Storage.ObjectReplicationPoliciesOperations ObjectReplicationPolicies { get { throw null; } }
+        public virtual Azure.Management.Storage.Operations Operations { get { throw null; } }
+        public virtual Azure.Management.Storage.PrivateEndpointConnectionsOperations PrivateEndpointConnections { get { throw null; } }
+        public virtual Azure.Management.Storage.PrivateLinkResourcesOperations PrivateLinkResources { get { throw null; } }
+        public virtual Azure.Management.Storage.QueueOperations Queue { get { throw null; } }
+        public virtual Azure.Management.Storage.QueueServicesOperations QueueServices { get { throw null; } }
+        public virtual Azure.Management.Storage.SkusOperations Skus { get { throw null; } }
+        public virtual Azure.Management.Storage.StorageAccountsOperations StorageAccounts { get { throw null; } }
+        public virtual Azure.Management.Storage.TableOperations Table { get { throw null; } }
+        public virtual Azure.Management.Storage.TableServicesOperations TableServices { get { throw null; } }
+        public virtual Azure.Management.Storage.UsagesOperations Usages { get { throw null; } }
     }
     public partial class StorageManagementClientOptions : Azure.Core.ClientOptions
     {
         public StorageManagementClientOptions() { }
     }
-    public partial class TableClient
+    public partial class TableOperations
     {
-        protected TableClient() { }
+        protected TableOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.Table> Create(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.Table>> CreateAsync(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response Delete(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -266,9 +266,9 @@ protected TableClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.Table> Update(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.Table>> UpdateAsync(string resourceGroupName, string accountName, string tableName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class TableServicesClient
+    public partial class TableServicesOperations
     {
-        protected TableServicesClient() { }
+        protected TableServicesOperations() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.TableServiceProperties> GetServiceProperties(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.TableServiceProperties>> GetServicePropertiesAsync(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.Response<Azure.Management.Storage.Models.ListTableServices> List(string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
@@ -276,9 +276,9 @@ protected TableServicesClient() { }
         public virtual Azure.Response<Azure.Management.Storage.Models.TableServiceProperties> SetServiceProperties(string resourceGroupName, string accountName, Azure.Management.Storage.Models.TableServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual System.Threading.Tasks.Task<Azure.Response<Azure.Management.Storage.Models.TableServiceProperties>> SetServicePropertiesAsync(string resourceGroupName, string accountName, Azure.Management.Storage.Models.TableServiceProperties parameters, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
-    public partial class UsagesClient
+    public partial class UsagesOperations
     {
-        protected UsagesClient() { }
+        protected UsagesOperations() { }
         public virtual Azure.Pageable<Azure.Management.Storage.Models.Usage> ListByLocation(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
         public virtual Azure.AsyncPageable<Azure.Management.Storage.Models.Usage> ListByLocationAsync(string location, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }