diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceBaseImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceBaseImpl.java
index 2ffbaa2f9cc9..c808c04d66e2 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceBaseImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/AppServiceBaseImpl.java
@@ -358,7 +358,7 @@ Mono<SiteLogsConfigInner> updateDiagnosticLogsConfig(SiteLogsConfigInner siteLog
     }
 
     private AppServicePlanImpl newDefaultAppServicePlan() {
-        String planName = this.manager().getSdkContext().randomResourceName(name() + "plan", 32);
+        String planName = this.manager().sdkContext().randomResourceName(name() + "plan", 32);
         return newDefaultAppServicePlan(planName);
     }
 
diff --git a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java
index cf2b548364fe..e16cc2f898a7 100644
--- a/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java
+++ b/sdk/appservice/mgmt/src/main/java/com/azure/management/appservice/implementation/FunctionAppImpl.java
@@ -216,7 +216,7 @@ Mono<Indexable> submitAppSettings() {
                                         SETTING_WEBSITE_CONTENTAZUREFILECONNECTIONSTRING, connectionString);
                                     addAppSettingIfNotModified(
                                         SETTING_WEBSITE_CONTENTSHARE,
-                                        this.manager().getSdkContext().randomResourceName(name(), 32));
+                                        this.manager().sdkContext().randomResourceName(name(), 32));
                                 }
                                 return FunctionAppImpl.super.submitAppSettings();
                             }))
@@ -631,7 +631,7 @@ public Flux<Indexable> createAsync() {
             }
             if (currentStorageAccount == null && storageAccountToSet == null && storageAccountCreatable == null) {
                 withNewStorageAccount(
-                    this.manager().getSdkContext().randomResourceName(name(), 20),
+                    this.manager().sdkContext().randomResourceName(name(), 20),
                     com.azure.management.storage.SkuName.STANDARD_GRS);
             }
         }
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java
index ababc8c94b97..ee4258b7f845 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineImpl.java
@@ -184,7 +184,7 @@ public JsonProperty.Access findPropertyAccess(Annotated annotated) {
         this.networkManager = networkManager;
         this.vmName = name;
         this.isMarketplaceLinuxImage = false;
-        this.namer = this.manager().getSdkContext().getResourceNamerFactory().createResourceNamer(this.vmName);
+        this.namer = this.manager().sdkContext().getResourceNamerFactory().createResourceNamer(this.vmName);
         this.creatableSecondaryNetworkInterfaceKeys = new ArrayList<>();
         this.existingSecondaryNetworkInterfacesToAssociate = new ArrayList<>();
         this.virtualMachineExtensions =
diff --git a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
index 0a3773664586..0b1c64a721e1 100644
--- a/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
+++ b/sdk/compute/mgmt/src/main/java/com/azure/management/compute/implementation/VirtualMachineScaleSetImpl.java
@@ -163,7 +163,7 @@ public class VirtualMachineScaleSetImpl
         super(name, innerModel, computeManager);
         this.storageManager = storageManager;
         this.networkManager = networkManager;
-        this.namer = this.manager().getSdkContext().getResourceNamerFactory().createResourceNamer(this.name());
+        this.namer = this.manager().sdkContext().getResourceNamerFactory().createResourceNamer(this.name());
         this.managedDataDisks = new ManagedDataDiskCollection(this);
         this.virtualMachineScaleSetMsiHandler = new VirtualMachineScaleSetMsiHandler(rbacManager, this);
         this.bootDiagnosticsHandler = new BootDiagnosticsHandler(this);
diff --git a/sdk/management/azure/src/test/java/com/azure/management/ApplicationGatewayTests.java b/sdk/management/azure/src/test/java/com/azure/management/ApplicationGatewayTests.java
index e16c252aed8d..a4a22ade32b1 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/ApplicationGatewayTests.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/ApplicationGatewayTests.java
@@ -67,10 +67,10 @@ public void testAppGatewaysPublicUrlPathBased() throws Exception {
 
     @Test
     public void testAppGatewayBackendHealthCheck() throws Exception {
-        String testId = azure.applicationGateways().manager().getSdkContext().randomResourceName("", 15);
+        String testId = azure.applicationGateways().manager().sdkContext().randomResourceName("", 15);
         String name = "ag" + testId;
         Region region = Region.US_EAST;
-        String password = azure.applicationGateways().manager().getSdkContext().randomResourceName("Abc.123", 12);
+        String password = azure.applicationGateways().manager().sdkContext().randomResourceName("Abc.123", 12);
         String vnetName = "net" + testId;
         String rgName = "rg" + testId;
 
@@ -278,7 +278,7 @@ public void testAppGatewaysStartStop() throws Exception {
 
     @Test
     public void testApplicationGatewaysInParallel() throws Exception {
-        String rgName = azure.applicationGateways().manager().getSdkContext().randomResourceName("rg", 13);
+        String rgName = azure.applicationGateways().manager().sdkContext().randomResourceName("rg", 13);
         Region region = Region.US_EAST;
         Creatable<ResourceGroup> resourceGroup = azure.resourceGroups().define(rgName).withRegion(region);
         List<Creatable<ApplicationGateway>> agCreatables = new ArrayList<>();
@@ -287,7 +287,7 @@ public void testApplicationGatewaysInParallel() throws Exception {
             .add(
                 azure
                     .applicationGateways()
-                    .define(azure.applicationGateways().manager().getSdkContext().randomResourceName("ag", 13))
+                    .define(azure.applicationGateways().manager().sdkContext().randomResourceName("ag", 13))
                     .withRegion(Region.US_EAST)
                     .withNewResourceGroup(resourceGroup)
                     .defineRequestRoutingRule("rule1")
@@ -302,7 +302,7 @@ public void testApplicationGatewaysInParallel() throws Exception {
             .add(
                 azure
                     .applicationGateways()
-                    .define(azure.applicationGateways().manager().getSdkContext().randomResourceName("ag", 13))
+                    .define(azure.applicationGateways().manager().sdkContext().randomResourceName("ag", 13))
                     .withRegion(Region.US_EAST)
                     .withNewResourceGroup(resourceGroup)
                     .defineRequestRoutingRule("rule1")
diff --git a/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java b/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java
index cf1ac33ae3b3..022e093978b9 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/AzureTests.java
@@ -184,7 +184,7 @@ public void run() {
      */
     @Test
     public void testDeployments() throws Exception {
-        String testId = azure.deployments().manager().getSdkContext().randomResourceName("", 8);
+        String testId = azure.deployments().manager().sdkContext().randomResourceName("", 8);
         PagedIterable<Deployment> deployments = azure.deployments().list();
         System.out.println("Deployments: " + TestUtilities.getSize(deployments));
         Deployment deployment =
@@ -216,13 +216,13 @@ public void testGenericResources() throws Exception {
         NetworkSecurityGroup nsg =
             azure
                 .networkSecurityGroups()
-                .define(azure.networkSecurityGroups().manager().getSdkContext().randomResourceName("nsg", 13))
+                .define(azure.networkSecurityGroups().manager().sdkContext().randomResourceName("nsg", 13))
                 .withRegion(Region.US_EAST)
                 .withNewResourceGroup()
                 .create();
         azure
             .publicIpAddresses()
-            .define(azure.networkSecurityGroups().manager().getSdkContext().randomResourceName("pip", 13))
+            .define(azure.networkSecurityGroups().manager().sdkContext().randomResourceName("pip", 13))
             .withRegion(Region.US_EAST)
             .withExistingResourceGroup(nsg.resourceGroupName())
             .create();
@@ -559,7 +559,7 @@ public void testLoadBalancersInternalWithAvailabilityZone() throws Exception {
 
     @Test
     public void testManagedDiskVMUpdate() throws Exception {
-        SdkContext context = azure.disks().manager().getSdkContext();
+        SdkContext context = azure.disks().manager().sdkContext();
         final String rgName = context.randomResourceName("rg", 13);
         final String linuxVM2Name = context.randomResourceName("vm" + "-", 10);
         final String linuxVM2Pip = context.randomResourceName("pip" + "-", 18);
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestAvailabilitySet.java b/sdk/management/azure/src/test/java/com/azure/management/TestAvailabilitySet.java
index 527287b36a51..71798ffb7d33 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestAvailabilitySet.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestAvailabilitySet.java
@@ -13,7 +13,7 @@
 public class TestAvailabilitySet extends TestTemplate<AvailabilitySet, AvailabilitySets> {
     @Override
     public AvailabilitySet createResource(AvailabilitySets availabilitySets) throws Exception {
-        final String newName = availabilitySets.manager().getSdkContext().randomResourceName("as", 10);
+        final String newName = availabilitySets.manager().sdkContext().randomResourceName("as", 10);
         AvailabilitySet aset =
             availabilitySets
                 .define(newName)
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestContainerRegistry.java b/sdk/management/azure/src/test/java/com/azure/management/TestContainerRegistry.java
index 90a6d2343886..6706548dec63 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestContainerRegistry.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestContainerRegistry.java
@@ -15,7 +15,7 @@ public class TestContainerRegistry extends TestTemplate<Registry, Registries> {
 
     @Override
     public Registry createResource(Registries registries) throws Exception {
-        final String testId = registries.manager().getSdkContext().randomResourceName("", 8);
+        final String testId = registries.manager().sdkContext().randomResourceName("", 8);
         final String newName = "acr" + testId;
         final String rgName = "rgacr" + testId;
         Registry registry =
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestCosmosDB.java b/sdk/management/azure/src/test/java/com/azure/management/TestCosmosDB.java
index 1fa19a1de701..a03af6490cc2 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestCosmosDB.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestCosmosDB.java
@@ -13,7 +13,7 @@ public class TestCosmosDB extends TestTemplate<CosmosDBAccount, CosmosDBAccounts
 
     @Override
     public CosmosDBAccount createResource(CosmosDBAccounts resources) throws Exception {
-        final String newName = "docDB" + resources.manager().getSdkContext().randomResourceName("", 8);
+        final String newName = "docDB" + resources.manager().sdkContext().randomResourceName("", 8);
         CosmosDBAccount databaseAccount =
             resources
                 .define(newName)
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestExpressRouteCircuit.java b/sdk/management/azure/src/test/java/com/azure/management/TestExpressRouteCircuit.java
index 9812b03bd8ba..e3e7dac8e81a 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestExpressRouteCircuit.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestExpressRouteCircuit.java
@@ -26,7 +26,7 @@ private void initializeResourceNames(SdkContext sdkContext) {
     public class Basic extends TestTemplate<ExpressRouteCircuit, ExpressRouteCircuits> {
         @Override
         public ExpressRouteCircuit createResource(ExpressRouteCircuits expressRouteCircuits) throws Exception {
-            initializeResourceNames(expressRouteCircuits.manager().getSdkContext());
+            initializeResourceNames(expressRouteCircuits.manager().sdkContext());
 
             // create Express Route Circuit
             ExpressRouteCircuit erc =
@@ -78,7 +78,7 @@ public void print(ExpressRouteCircuit resource) {
     public class ExpressRouteCircuitPeering extends TestTemplate<ExpressRouteCircuit, ExpressRouteCircuits> {
         @Override
         public ExpressRouteCircuit createResource(ExpressRouteCircuits expressRouteCircuits) throws Exception {
-            initializeResourceNames(expressRouteCircuits.manager().getSdkContext());
+            initializeResourceNames(expressRouteCircuits.manager().sdkContext());
 
             // create Express Route Circuit
             ExpressRouteCircuit erc =
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestKubernetesCluster.java b/sdk/management/azure/src/test/java/com/azure/management/TestKubernetesCluster.java
index ccd19e93da6c..8a8f2e72be4a 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestKubernetesCluster.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestKubernetesCluster.java
@@ -28,7 +28,7 @@ public class TestKubernetesCluster extends TestTemplate<KubernetesCluster, Kuber
     public KubernetesCluster createResource(KubernetesClusters kubernetesClusters) throws Exception {
         final String sshKeyData = this.getSshKey();
 
-        final String newName = "aks" + kubernetesClusters.manager().getSdkContext().randomResourceName("", 8);
+        final String newName = "aks" + kubernetesClusters.manager().sdkContext().randomResourceName("", 8);
         final String dnsPrefix = "dns" + newName;
         final String agentPoolName = "ap" + newName;
         String clientId = "clientId";
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestLoadBalancer.java b/sdk/management/azure/src/test/java/com/azure/management/TestLoadBalancer.java
index 5156a2155175..a3fee24b12bb 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestLoadBalancer.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestLoadBalancer.java
@@ -66,7 +66,7 @@ public class InternetWithNatPool extends TestTemplate<LoadBalancer, LoadBalancer
          * @param computeManager compute manager
          */
         public InternetWithNatPool(ComputeManager computeManager) {
-            initializeResourceNames(computeManager.getSdkContext());
+            initializeResourceNames(computeManager.sdkContext());
             this.computeManager = computeManager;
         }
 
@@ -214,7 +214,7 @@ public class InternetWithNatRule extends TestTemplate<LoadBalancer, LoadBalancer
          * @param computeManager compute manager
          */
         public InternetWithNatRule(ComputeManager computeManager) {
-            initializeResourceNames(computeManager.getSdkContext());
+            initializeResourceNames(computeManager.sdkContext());
             this.computeManager = computeManager;
         }
 
@@ -410,7 +410,7 @@ public class InternetNatOnly extends TestTemplate<LoadBalancer, LoadBalancers> {
          * @param computeManager compute manager
          */
         public InternetNatOnly(ComputeManager computeManager) {
-            initializeResourceNames(computeManager.getSdkContext());
+            initializeResourceNames(computeManager.sdkContext());
             this.computeManager = computeManager;
         }
 
@@ -562,7 +562,7 @@ public class InternetMinimal extends TestTemplate<LoadBalancer, LoadBalancers> {
          * @param computeManager compute manager
          */
         public InternetMinimal(ComputeManager computeManager) {
-            initializeResourceNames(computeManager.getSdkContext());
+            initializeResourceNames(computeManager.sdkContext());
             this.computeManager = computeManager;
         }
 
@@ -574,7 +574,7 @@ public void print(LoadBalancer resource) {
         @Override
         public LoadBalancer createResource(LoadBalancers resources) throws Exception {
             VirtualMachine[] existingVMs = ensureVMs(resources.manager().networks(), this.computeManager, 2);
-            String pipDnsLabel = resources.manager().getSdkContext().randomResourceName("pip", 20);
+            String pipDnsLabel = resources.manager().sdkContext().randomResourceName("pip", 20);
 
             // Create a load balancer
             LoadBalancer lb =
@@ -736,7 +736,7 @@ public class InternalMinimal extends TestTemplate<LoadBalancer, LoadBalancers> {
          * @param computeManager compute manager
          */
         public InternalMinimal(ComputeManager computeManager) {
-            initializeResourceNames(computeManager.getSdkContext());
+            initializeResourceNames(computeManager.sdkContext());
             this.computeManager = computeManager;
         }
 
@@ -916,7 +916,7 @@ public class InternalWithZone extends TestTemplate<LoadBalancer, LoadBalancers>
          */
         public InternalWithZone(ComputeManager computeManager) {
             region = Region.US_EAST2;
-            initializeResourceNames(computeManager.getSdkContext());
+            initializeResourceNames(computeManager.sdkContext());
             this.computeManager = computeManager;
         }
 
@@ -1052,7 +1052,7 @@ private VirtualMachine[] ensureVMs(Networks networks, ComputeManager computeMana
         String userName = "testuser" + testId;
         List<Creatable<VirtualMachine>> vmDefinitions = new ArrayList<>();
         for (int i = 0; i < count; i++) {
-            String vmName = computeManager.getSdkContext().randomResourceName("vm", 15);
+            String vmName = computeManager.sdkContext().randomResourceName("vm", 15);
 
             Creatable<VirtualMachine> vm =
                 computeManager
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestLocalNetworkGateway.java b/sdk/management/azure/src/test/java/com/azure/management/TestLocalNetworkGateway.java
index 69afa594903f..1df7b6ebc900 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestLocalNetworkGateway.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestLocalNetworkGateway.java
@@ -23,7 +23,7 @@ private void initializeResourceNames(SdkContext sdkContext) {
 
     @Override
     public LocalNetworkGateway createResource(LocalNetworkGateways localNetworkGateways) throws Exception {
-        initializeResourceNames(localNetworkGateways.manager().getSdkContext());
+        initializeResourceNames(localNetworkGateways.manager().sdkContext());
         LocalNetworkGateway gateway =
             localNetworkGateways
                 .define(lngwName)
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestNSG.java b/sdk/management/azure/src/test/java/com/azure/management/TestNSG.java
index 0313d81372d3..abfd0911b91b 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestNSG.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestNSG.java
@@ -20,11 +20,11 @@
 public class TestNSG extends TestTemplate<NetworkSecurityGroup, NetworkSecurityGroups> {
     @Override
     public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Exception {
-        String postFix = nsgs.manager().getSdkContext().randomResourceName("", 8);
+        String postFix = nsgs.manager().sdkContext().randomResourceName("", 8);
         final String newName = "nsg" + postFix;
         final String resourceGroupName = "rg" + postFix;
         final String nicName = "nic" + postFix;
-        final String asgName = nsgs.manager().getSdkContext().randomResourceName("asg", 8);
+        final String asgName = nsgs.manager().sdkContext().randomResourceName("asg", 8);
         final Region region = Region.US_WEST;
         final SettableFuture<NetworkSecurityGroup> nsgFuture = SettableFuture.create();
 
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestNetwork.java b/sdk/management/azure/src/test/java/com/azure/management/TestNetwork.java
index f4a36fd8e65e..c0b1ec8cd45d 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestNetwork.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestNetwork.java
@@ -28,7 +28,7 @@ public class WithSubnets extends TestTemplate<Network, Networks> {
         @Override
         public Network createResource(Networks networks) throws Exception {
 
-            String postFix = networks.manager().getSdkContext().randomResourceName("", 8);
+            String postFix = networks.manager().sdkContext().randomResourceName("", 8);
             final String newName = "net" + postFix;
             Region region = Region.US_WEST;
             String groupName = "rg" + postFix;
@@ -91,7 +91,7 @@ public Network updateResource(Network resource) throws Exception {
                 resource
                     .manager()
                     .networkSecurityGroups()
-                    .define(resource.manager().getSdkContext().randomResourceName("nsgB", 10))
+                    .define(resource.manager().sdkContext().randomResourceName("nsgB", 10))
                     .withRegion(resource.region())
                     .withExistingResourceGroup(resource.resourceGroupName())
                     .create();
@@ -153,7 +153,7 @@ public class WithAccessFromServiceToSubnet extends TestTemplate<Network, Network
 
         @Override
         public Network createResource(Networks networks) throws Exception {
-            String postfix = networks.manager().getSdkContext().randomResourceName("", 8);
+            String postfix = networks.manager().sdkContext().randomResourceName("", 8);
             final String newName = "net" + postfix;
             Region region = Region.US_WEST;
             String groupName = "rg" + postfix;
@@ -250,10 +250,10 @@ public class WithPeering extends TestTemplate<Network, Networks> {
         @Override
         public Network createResource(Networks networks) throws Exception {
             Region region = Region.US_EAST;
-            String groupName = networks.manager().getSdkContext().randomResourceName("rg", 10);
+            String groupName = networks.manager().sdkContext().randomResourceName("rg", 10);
 
-            String networkName = networks.manager().getSdkContext().randomResourceName("net", 15);
-            String networkName2 = networks.manager().getSdkContext().randomResourceName("net", 15);
+            String networkName = networks.manager().sdkContext().randomResourceName("net", 15);
+            String networkName2 = networks.manager().sdkContext().randomResourceName("net", 15);
 
             Creatable<Network> remoteNetworkDefinition =
                 networks
@@ -374,9 +374,9 @@ public class WithDDosProtectionPlanAndVmProtection extends TestTemplate<Network,
         @Override
         public Network createResource(Networks networks) throws Exception {
             Region region = Region.US_EAST2;
-            String groupName = networks.manager().getSdkContext().randomResourceName("rg", 10);
+            String groupName = networks.manager().sdkContext().randomResourceName("rg", 10);
 
-            String networkName = networks.manager().getSdkContext().randomResourceName("net", 15);
+            String networkName = networks.manager().sdkContext().randomResourceName("net", 15);
 
             Network network =
                 networks
@@ -413,9 +413,9 @@ public class WithUpdateTags extends TestTemplate<Network, Networks> {
         @Override
         public Network createResource(Networks networks) throws Exception {
             Region region = Region.US_SOUTH_CENTRAL;
-            String groupName = networks.manager().getSdkContext().randomResourceName("rg", 10);
+            String groupName = networks.manager().sdkContext().randomResourceName("rg", 10);
 
-            String networkName = networks.manager().getSdkContext().randomResourceName("net", 15);
+            String networkName = networks.manager().sdkContext().randomResourceName("net", 15);
 
             Network network =
                 networks
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestNetworkInterface.java b/sdk/management/azure/src/test/java/com/azure/management/TestNetworkInterface.java
index c49d7fcdccfe..aafb8053b4b0 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestNetworkInterface.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestNetworkInterface.java
@@ -18,7 +18,7 @@ public class TestNetworkInterface extends TestTemplate<NetworkInterface, Network
     @Override
     public NetworkInterface createResource(NetworkInterfaces networkInterfaces) throws Exception {
 
-        String postfix = networkInterfaces.manager().getSdkContext().randomResourceName("", 8);
+        String postfix = networkInterfaces.manager().sdkContext().randomResourceName("", 8);
         final String nicName = "nic" + postfix;
         final String vnetName = "net" + postfix;
         final String pipName = "pip" + postfix;
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java b/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java
index 5c664ab7397b..daeb936f1dff 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestNetworkWatcher.java
@@ -40,7 +40,7 @@ private void initializeResourceNames(SdkContext sdkContext) {
     @Override
     public NetworkWatcher createResource(NetworkWatchers networkWatchers) throws Exception {
         // Network Watcher should be in the same region as monitored resources
-        initializeResourceNames(networkWatchers.manager().getSdkContext());
+        initializeResourceNames(networkWatchers.manager().sdkContext());
 
         // make sure Network Watcher is disabled in current subscription and region as only one can exist
         PagedIterable<NetworkWatcher> nwList = networkWatchers.list();
@@ -113,7 +113,7 @@ VirtualMachine[] ensureNetwork(Networks networks, VirtualMachines vms, NetworkIn
 
         Creatable<VirtualMachine> vm1 =
             vms
-                .define(networks.manager().getSdkContext().randomResourceName("vm", 15))
+                .define(networks.manager().sdkContext().randomResourceName("vm", 15))
                 .withRegion(REGION)
                 .withExistingResourceGroup(groupName)
                 .withExistingPrimaryNetworkInterface(nic)
@@ -128,7 +128,7 @@ VirtualMachine[] ensureNetwork(Networks networks, VirtualMachines vms, NetworkIn
                 .withMinorVersionAutoUpgrade()
                 .attach();
 
-        String vmName = networks.manager().getSdkContext().randomResourceName("vm", 15);
+        String vmName = networks.manager().sdkContext().randomResourceName("vm", 15);
 
         Creatable<VirtualMachine> vm2 =
             vms
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestPublicIPAddress.java b/sdk/management/azure/src/test/java/com/azure/management/TestPublicIPAddress.java
index 3a2a9a100b70..ee755f27f245 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestPublicIPAddress.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestPublicIPAddress.java
@@ -15,7 +15,7 @@
 public class TestPublicIPAddress extends TestTemplate<PublicIpAddress, PublicIpAddresses> {
     @Override
     public PublicIpAddress createResource(PublicIpAddresses pips) throws Exception {
-        final String newPipName = pips.manager().getSdkContext().randomResourceName("pip", 10);
+        final String newPipName = pips.manager().sdkContext().randomResourceName("pip", 10);
 
         PublicIpAddress pip =
             pips
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java b/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java
index e08396868543..35829c30e941 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestResourceStreaming.java
@@ -25,7 +25,7 @@ public TestResourceStreaming(StorageAccounts storageAccounts) {
 
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
 
         System.out.println("In createResource \n\n\n");
 
@@ -34,13 +34,13 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc
                 .manager()
                 .resourceManager()
                 .resourceGroups()
-                .define(virtualMachines.manager().getSdkContext().randomResourceName("rg" + vmName, 20))
+                .define(virtualMachines.manager().sdkContext().randomResourceName("rg" + vmName, 20))
                 .withRegion(Region.US_EAST);
 
         Creatable<StorageAccount> storageCreatable =
             this
                 .storageAccounts
-                .define(virtualMachines.manager().getSdkContext().randomResourceName("stg", 20))
+                .define(virtualMachines.manager().sdkContext().randomResourceName("stg", 20))
                 .withRegion(Region.US_EAST)
                 .withNewResourceGroup(rgCreatable);
 
@@ -55,13 +55,13 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc
                     .withNewPrimaryNetwork("10.0.0.0/28")
                     .withPrimaryPrivateIPAddressDynamic()
                     .withNewPrimaryPublicIPAddress(
-                        virtualMachines.manager().getSdkContext().randomResourceName("pip", 20))
+                        virtualMachines.manager().sdkContext().randomResourceName("pip", 20))
                     .withPopularWindowsImage(KnownWindowsVirtualMachineImage.WINDOWS_SERVER_2012_R2_DATACENTER)
                     .withAdminUsername("testuser")
                     .withAdminPassword("12NewPA$$w0rd!")
                     .withSize(VirtualMachineSizeTypes.STANDARD_D1_V2)
                     .withNewStorageAccount(storageCreatable)
-                    .withNewAvailabilitySet(virtualMachines.manager().getSdkContext().randomResourceName("avset", 10))
+                    .withNewAvailabilitySet(virtualMachines.manager().sdkContext().randomResourceName("avset", 10))
                     .createAsync()
                     .map(
                         resource -> {
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestRouteTables.java b/sdk/management/azure/src/test/java/com/azure/management/TestRouteTables.java
index cb6f8e09d6b2..f12f3dc6401c 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestRouteTables.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestRouteTables.java
@@ -26,11 +26,11 @@ public class Minimal extends TestTemplate<RouteTable, RouteTables> {
 
         @Override
         public RouteTable createResource(RouteTables routeTables) throws Exception {
-            netName = routeTables.manager().getSdkContext().randomResourceName("net", 10);
-            final String newName = routeTables.manager().getSdkContext().randomResourceName("rt", 10);
+            netName = routeTables.manager().sdkContext().randomResourceName("net", 10);
+            final String newName = routeTables.manager().sdkContext().randomResourceName("rt", 10);
 
             Region region = Region.US_WEST;
-            String groupName = routeTables.manager().getSdkContext().randomResourceName("rg", 10);
+            String groupName = routeTables.manager().sdkContext().randomResourceName("rg", 10);
 
             final String route1AddressPrefix = "10.0.1.0/29";
             final String route2AddressPrefix = "10.0.0.0/29";
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestSql.java b/sdk/management/azure/src/test/java/com/azure/management/TestSql.java
index c60a8ef2cf1e..551d88a11752 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestSql.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestSql.java
@@ -15,7 +15,7 @@
 public class TestSql extends TestTemplate<SqlServer, SqlServers> {
     @Override
     public SqlServer createResource(SqlServers resources) throws Exception {
-        final String sqlServerName = resources.manager().getSdkContext().randomResourceName("sql", 10);
+        final String sqlServerName = resources.manager().sdkContext().randomResourceName("sql", 10);
         final SqlServer[] sqlServers = new SqlServer[1];
         final SettableFuture<SqlServer> future = SettableFuture.create();
         Flux<Indexable> resourceStream =
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachine.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachine.java
index 562a4d797c29..601c3e5da9ec 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachine.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachine.java
@@ -18,7 +18,7 @@
 public class TestVirtualMachine extends TestTemplate<VirtualMachine, VirtualMachines> {
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
 
         final VirtualMachine[] vms = new VirtualMachine[1];
         final SettableFuture<VirtualMachine> future = SettableFuture.create();
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineCustomData.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineCustomData.java
index af35ebc86135..c09c93819f8e 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineCustomData.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineCustomData.java
@@ -30,8 +30,8 @@ public TestVirtualMachineCustomData(PublicIpAddresses pips) {
 
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
-        final String publicIpDnsLabel = virtualMachines.manager().getSdkContext().randomResourceName("abc", 16);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
+        final String publicIpDnsLabel = virtualMachines.manager().sdkContext().randomResourceName("abc", 16);
 
         // Prepare the custom data
         //
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineDataDisk.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineDataDisk.java
index 4e2504312f6b..cf15bc761adc 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineDataDisk.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineDataDisk.java
@@ -15,7 +15,7 @@
 public class TestVirtualMachineDataDisk extends TestTemplate<VirtualMachine, VirtualMachines> {
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
         VirtualMachine virtualMachine =
             virtualMachines
                 .define(vmName)
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineInAvailabilitySet.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineInAvailabilitySet.java
index d7d2c775c6c2..def412c47e94 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineInAvailabilitySet.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineInAvailabilitySet.java
@@ -13,9 +13,9 @@
 public class TestVirtualMachineInAvailabilitySet extends TestTemplate<VirtualMachine, VirtualMachines> {
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
-        final String newRgName = virtualMachines.manager().getSdkContext().randomResourceName("rgVmInAvail", 10);
-        final String newAvailSetName = virtualMachines.manager().getSdkContext().randomResourceName("avai", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
+        final String newRgName = virtualMachines.manager().sdkContext().randomResourceName("rgVmInAvail", 10);
+        final String newAvailSetName = virtualMachines.manager().sdkContext().randomResourceName("avai", 10);
 
         VirtualMachine vm =
             virtualMachines
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineNics.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineNics.java
index 5fd67124a6f6..5922f249336f 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineNics.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineNics.java
@@ -27,13 +27,13 @@ public TestVirtualMachineNics(NetworkManager networkManager) {
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
         // Prepare the resource group definition
-        final String rgName = virtualMachines.manager().getSdkContext().randomResourceName("rg", 10);
+        final String rgName = virtualMachines.manager().sdkContext().randomResourceName("rg", 10);
 
         Creatable<ResourceGroup> resourceGroupCreatable =
             virtualMachines.manager().resourceManager().resourceGroups().define(rgName).withRegion(Region.US_EAST);
 
         // Prepare the virtual network definition [shared by primary and secondary network interfaces]
-        final String vnetName = virtualMachines.manager().getSdkContext().randomResourceName("vnet", 10);
+        final String vnetName = virtualMachines.manager().sdkContext().randomResourceName("vnet", 10);
 
         Creatable<Network> networkCreatable =
             this
@@ -45,7 +45,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc
                 .withAddressSpace("10.0.0.0/28");
 
         // Prepare the secondary network interface definition
-        secondaryNicName = virtualMachines.manager().getSdkContext().randomResourceName("nic", 10);
+        secondaryNicName = virtualMachines.manager().sdkContext().randomResourceName("nic", 10);
 
         Creatable<NetworkInterface> secondaryNetworkInterfaceCreatable =
             this
@@ -60,7 +60,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc
         // [Secondary NIC cannot have PublicIP - Only primary network interface can reference a public IP address]
 
         // Prepare the secondary network interface definition
-        final String secondaryNicName2 = virtualMachines.manager().getSdkContext().randomResourceName("nic2", 10);
+        final String secondaryNicName2 = virtualMachines.manager().sdkContext().randomResourceName("nic2", 10);
 
         Creatable<NetworkInterface> secondaryNetworkInterfaceCreatable2 =
             this
@@ -73,7 +73,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc
                 .withPrimaryPrivateIPAddressStatic("10.0.0.6");
 
         // Create Virtual Machine
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
 
         final String primaryPipName = "pip" + vmName;
         VirtualMachine virtualMachine =
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSizes.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSizes.java
index 74489780c97a..0a56337fabae 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSizes.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSizes.java
@@ -19,7 +19,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc
         Assertions.assertTrue(TestUtilities.getSize(availableSizes) > 0);
         VirtualMachineSize availableSize = availableSizes.iterator().next();
         System.out.println("VM Sizes: " + availableSizes);
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
         VirtualMachine vm =
             virtualMachines
                 .define(vmName)
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSsh.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSsh.java
index 0f51fc29f9ab..a0f352f55db4 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSsh.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualMachineSsh.java
@@ -24,7 +24,7 @@ public TestVirtualMachineSsh(PublicIpAddresses pips) {
 
     @Override
     public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exception {
-        final String vmName = virtualMachines.manager().getSdkContext().randomResourceName("vm", 10);
+        final String vmName = virtualMachines.manager().sdkContext().randomResourceName("vm", 10);
 
         final String sshKey =
             "ssh-rsa"
diff --git a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualNetworkGateway.java b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualNetworkGateway.java
index 5bd84432da47..256302883f1c 100644
--- a/sdk/management/azure/src/test/java/com/azure/management/TestVirtualNetworkGateway.java
+++ b/sdk/management/azure/src/test/java/com/azure/management/TestVirtualNetworkGateway.java
@@ -47,7 +47,7 @@ private void initializeResourceNames(SdkContext sdkContext) {
     public class Basic extends TestTemplate<VirtualNetworkGateway, VirtualNetworkGateways> {
 
         public Basic(NetworkManager networkManager) {
-            initializeResourceNames(networkManager.getSdkContext());
+            initializeResourceNames(networkManager.sdkContext());
         }
 
         @Override
@@ -95,7 +95,7 @@ public VirtualNetworkGateway updateResource(VirtualNetworkGateway resource) thro
     /** Test Site-To-Site Virtual Network Gateway Connection. */
     public class SiteToSite extends TestTemplate<VirtualNetworkGateway, VirtualNetworkGateways> {
         public SiteToSite(NetworkManager networkManager) {
-            initializeResourceNames(networkManager.getSdkContext());
+            initializeResourceNames(networkManager.sdkContext());
         }
 
         @Override
@@ -107,7 +107,7 @@ public void print(VirtualNetworkGateway resource) {
         public VirtualNetworkGateway createResource(VirtualNetworkGateways gateways) throws Exception {
 
             // Create virtual network gateway
-            initializeResourceNames(gateways.manager().getSdkContext());
+            initializeResourceNames(gateways.manager().sdkContext());
             VirtualNetworkGateway vngw =
                 gateways
                     .define(gatewayName1)
@@ -184,7 +184,7 @@ public VirtualNetworkGateway updateResource(VirtualNetworkGateway resource) thro
     public class VNetToVNet extends TestTemplate<VirtualNetworkGateway, VirtualNetworkGateways> {
 
         public VNetToVNet(NetworkManager networkManager) {
-            initializeResourceNames(networkManager.getSdkContext());
+            initializeResourceNames(networkManager.sdkContext());
         }
 
         @Override
@@ -266,7 +266,7 @@ public VirtualNetworkGateway updateResource(VirtualNetworkGateway resource) thro
     public class PointToSite extends TestTemplate<VirtualNetworkGateway, VirtualNetworkGateways> {
 
         public PointToSite(NetworkManager networkManager) {
-            initializeResourceNames(networkManager.getSdkContext());
+            initializeResourceNames(networkManager.sdkContext());
         }
 
         @Override
@@ -278,7 +278,7 @@ public void print(VirtualNetworkGateway resource) {
         public VirtualNetworkGateway createResource(final VirtualNetworkGateways gateways) throws Exception {
 
             // Create virtual network gateway
-            initializeResourceNames(gateways.manager().getSdkContext());
+            initializeResourceNames(gateways.manager().sdkContext());
 
             Network network =
                 gateways
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java
index dac645fe06c9..672fde4c095b 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayBackendHttpConfigurationImpl.java
@@ -271,7 +271,7 @@ public ApplicationGatewayBackendHttpConfigurationImpl withAuthenticationCertific
 
         // If matching cert reference not found, create a new one
         if (certName == null) {
-            certName = this.parent().manager().getSdkContext().randomResourceName("cert", 20);
+            certName = this.parent().manager().sdkContext().randomResourceName("cert", 20);
             this.parent().defineAuthenticationCertificate(certName).fromBase64(base64Data).attach();
         }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java
index a26ae5638ffb..86abe40e6845 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayImpl.java
@@ -410,7 +410,7 @@ protected SubResource ensureBackendRef(String name) {
     }
 
     protected ApplicationGatewayBackendImpl ensureUniqueBackend() {
-        String name = this.manager().getSdkContext().randomResourceName("backend", 20);
+        String name = this.manager().sdkContext().randomResourceName("backend", 20);
         ApplicationGatewayBackendImpl backend = this.defineBackend(name);
         backend.attach();
         return backend;
@@ -420,7 +420,7 @@ private ApplicationGatewayIpConfigurationImpl ensureDefaultIPConfig() {
         ApplicationGatewayIpConfigurationImpl ipConfig =
             (ApplicationGatewayIpConfigurationImpl) defaultIPConfiguration();
         if (ipConfig == null) {
-            String name = this.manager().getSdkContext().randomResourceName("ipcfg", 11);
+            String name = this.manager().sdkContext().randomResourceName("ipcfg", 11);
             ipConfig = this.defineIPConfiguration(name);
             ipConfig.attach();
         }
@@ -432,7 +432,7 @@ protected ApplicationGatewayFrontendImpl ensureDefaultPrivateFrontend() {
         if (frontend != null) {
             return frontend;
         } else {
-            String name = this.manager().getSdkContext().randomResourceName("frontend", 14);
+            String name = this.manager().sdkContext().randomResourceName("frontend", 14);
             frontend = this.defineFrontend(name);
             frontend.attach();
             this.defaultPrivateFrontend = frontend;
@@ -445,7 +445,7 @@ protected ApplicationGatewayFrontendImpl ensureDefaultPublicFrontend() {
         if (frontend != null) {
             return frontend;
         } else {
-            String name = this.manager().getSdkContext().randomResourceName("frontend", 14);
+            String name = this.manager().sdkContext().randomResourceName("frontend", 14);
             frontend = this.defineFrontend(name);
             frontend.attach();
             this.defaultPublicFrontend = frontend;
@@ -457,7 +457,7 @@ protected ApplicationGatewayFrontendImpl ensureDefaultPublicFrontend() {
 
     private Creatable<Network> ensureDefaultNetworkDefinition() {
         if (this.creatableNetwork == null) {
-            final String vnetName = this.manager().getSdkContext().randomResourceName("vnet", 10);
+            final String vnetName = this.manager().sdkContext().randomResourceName("vnet", 10);
             this.creatableNetwork =
                 this
                     .manager()
@@ -477,7 +477,7 @@ private Creatable<Network> ensureDefaultNetworkDefinition() {
 
     private Creatable<PublicIpAddress> ensureDefaultPipDefinition() {
         if (this.creatablePip == null) {
-            final String pipName = this.manager().getSdkContext().randomResourceName("pip", 9);
+            final String pipName = this.manager().sdkContext().randomResourceName("pip", 9);
             this.creatablePip =
                 this
                     .manager()
@@ -1043,7 +1043,7 @@ public ApplicationGatewayImpl withFrontendPort(int portNumber, String name) {
             // If no conflict, create a new port
             if (name == null) {
                 // No name specified, so auto-name it
-                name = this.manager().getSdkContext().randomResourceName("port", 9);
+                name = this.manager().sdkContext().randomResourceName("port", 9);
             }
 
             frontendPortByName = new ApplicationGatewayFrontendPort().withName(name).withPort(portNumber);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java
index 89671ea81440..1bfa4a339f1a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayListenerImpl.java
@@ -167,7 +167,7 @@ public ApplicationGatewayListenerImpl withFrontendPort(int portNumber) {
         String portName = this.parent().frontendPortNameFromNumber(portNumber);
         if (portName == null) {
             // Existing frontend port with this number not found so create one
-            portName = this.parent().manager().getSdkContext().randomResourceName("port", 9);
+            portName = this.parent().manager().sdkContext().randomResourceName("port", 9);
             this.parent().withFrontendPort(portNumber, portName);
         }
 
@@ -189,7 +189,7 @@ public ApplicationGatewayListenerImpl withSslCertificateFromKeyVaultSecretId(Str
     private ApplicationGatewayListenerImpl withSslCertificateFromKeyVaultSecretId(
         String keyVaultSecretId, String name) {
         if (name == null) {
-            name = this.parent().manager().getSdkContext().randomResourceName("cert", 10);
+            name = this.parent().manager().sdkContext().randomResourceName("cert", 10);
         }
         this.parent().defineSslCertificate(name).withKeyVaultSecretId(keyVaultSecretId).attach();
         return this;
@@ -202,7 +202,7 @@ public ApplicationGatewayListenerImpl withSslCertificateFromPfxFile(File pfxFile
 
     private ApplicationGatewayListenerImpl withSslCertificateFromPfxFile(File pfxFile, String name) throws IOException {
         if (name == null) {
-            name = this.parent().manager().getSdkContext().randomResourceName("cert", 10);
+            name = this.parent().manager().sdkContext().randomResourceName("cert", 10);
         }
         this.parent().defineSslCertificate(name).withPfxFromFile(pfxFile).attach();
         return this.withSslCertificate(name);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java
index 92a1248c4245..503da09b4c28 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleImpl.java
@@ -217,7 +217,7 @@ public ApplicationGatewayRequestRoutingRuleImpl toBackendHttpConfiguration(Strin
     private ApplicationGatewayBackendHttpConfigurationImpl ensureBackendHttpConfig() {
         ApplicationGatewayBackendHttpConfigurationImpl config = this.backendHttpConfiguration();
         if (config == null) {
-            final String name = this.parent().manager().getSdkContext().randomResourceName("bckcfg", 11);
+            final String name = this.parent().manager().sdkContext().randomResourceName("bckcfg", 11);
             config = this.parent().defineBackendHttpConfiguration(name);
             config.attach();
             this.toBackendHttpConfiguration(name);
@@ -227,7 +227,7 @@ private ApplicationGatewayBackendHttpConfigurationImpl ensureBackendHttpConfig()
 
     @Override
     public ApplicationGatewayRequestRoutingRuleImpl toBackendHttpPort(int portNumber) {
-        String name = this.parent().manager().getSdkContext().randomResourceName("backcfg", 12);
+        String name = this.parent().manager().sdkContext().randomResourceName("backcfg", 12);
         this.parent().defineBackendHttpConfiguration(name).withPort(portNumber).attach();
         return this.toBackendHttpConfiguration(name);
     }
@@ -268,7 +268,7 @@ private ApplicationGatewayRequestRoutingRuleImpl fromFrontendPort(
         if (needToCreate == ApplicationGatewayImpl.CreationState.NeedToCreate) {
             // If no listener exists for the requested port number yet and the name, create one
             if (name == null) {
-                name = this.parent().manager().getSdkContext().randomResourceName("listener", 13);
+                name = this.parent().manager().sdkContext().randomResourceName("listener", 13);
             }
 
             listenerByPort = this.parent().defineListener(name).withFrontendPort(portNumber);
@@ -300,7 +300,7 @@ private ApplicationGatewayRequestRoutingRuleImpl fromFrontendPort(
     private ApplicationGatewayListenerImpl ensureListener() {
         ApplicationGatewayListenerImpl listener = this.listener();
         if (listener == null) {
-            final String name = this.parent().manager().getSdkContext().randomResourceName("listener", 13);
+            final String name = this.parent().manager().sdkContext().randomResourceName("listener", 13);
             listener = this.parent().defineListener(name);
             listener.attach();
             this.fromListener(name);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java
index e791f7c24d37..a65324e6d464 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/ApplicationGatewayUrlPathMapImpl.java
@@ -96,7 +96,7 @@ public ApplicationGatewayUrlPathMapImpl toBackendHttpConfiguration(String name)
 
     @Override
     public ApplicationGatewayUrlPathMapImpl toBackendHttpPort(int portNumber) {
-        String name = this.parent().manager().getSdkContext().randomResourceName("backcfg", 12);
+        String name = this.parent().manager().sdkContext().randomResourceName("backcfg", 12);
         this.parent().defineBackendHttpConfiguration(name).withPort(portNumber).attach();
         return this.toBackendHttpConfiguration(name);
     }
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java
index 94335e7c1b50..7b40b8972183 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerFrontendImpl.java
@@ -236,7 +236,7 @@ public LoadBalancerFrontendImpl withNewPublicIpAddress(Creatable<PublicIpAddress
 
     @Override
     public LoadBalancerFrontendImpl withNewPublicIpAddress() {
-        String dnsLabel = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String dnsLabel = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         return this.withNewPublicIpAddress(dnsLabel);
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java
index e1cc4ce5665a..71b58ebfb4a9 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerImpl.java
@@ -105,7 +105,7 @@ protected void initializeChildrenFromInner() {
     }
 
     protected LoadBalancerBackendImpl ensureUniqueBackend() {
-        String name = this.manager().getSdkContext().randomResourceName("backend", 20);
+        String name = this.manager().sdkContext().randomResourceName("backend", 20);
         LoadBalancerBackendImpl backend = this.defineBackend(name);
         backend.attach();
         return backend;
@@ -126,7 +126,7 @@ protected SubResource ensureFrontendRef(String name) {
     }
 
     protected LoadBalancerFrontendImpl ensureUniqueFrontend() {
-        String name = this.manager().getSdkContext().randomResourceName("frontend", 20);
+        String name = this.manager().sdkContext().randomResourceName("frontend", 20);
         LoadBalancerFrontendImpl frontend = this.defineFrontend(name);
         frontend.attach();
         return frontend;
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java
index 0a81898f2f4d..c03a442b9c19 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatPoolImpl.java
@@ -112,21 +112,21 @@ public LoadBalancerInboundNatPoolImpl fromExistingPublicIPAddress(String resourc
 
     @Override
     public LoadBalancerInboundNatPoolImpl fromNewPublicIPAddress(String leafDnsLabel) {
-        String frontendName = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         this.parent().withNewPublicIPAddress(leafDnsLabel, frontendName);
         return fromFrontend(frontendName);
     }
 
     @Override
     public LoadBalancerInboundNatPoolImpl fromNewPublicIPAddress(Creatable<PublicIpAddress> pipDefinition) {
-        String frontendName = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         this.parent().withNewPublicIPAddress(pipDefinition, frontendName);
         return fromFrontend(frontendName);
     }
 
     @Override
     public LoadBalancerInboundNatPoolImpl fromNewPublicIPAddress() {
-        String dnsLabel = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String dnsLabel = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         return this.fromNewPublicIPAddress(dnsLabel);
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java
index 0f5a4002c313..8bd49877df7c 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancerInboundNatRuleImpl.java
@@ -162,7 +162,7 @@ public LoadBalancerInboundNatRuleImpl fromExistingPublicIPAddress(String resourc
 
     @Override
     public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(String leafDnsLabel) {
-        String frontendName = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         this.parent().withNewPublicIPAddress(leafDnsLabel, frontendName);
         this.fromFrontend(frontendName);
         return this;
@@ -170,7 +170,7 @@ public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(String leafDnsLabel
 
     @Override
     public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(Creatable<PublicIpAddress> pipDefinition) {
-        String frontendName = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         this.parent().withNewPublicIPAddress(pipDefinition, frontendName);
         this.fromFrontend(frontendName);
         return this;
@@ -178,7 +178,7 @@ public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress(Creatable<PublicIpA
 
     @Override
     public LoadBalancerInboundNatRuleImpl fromNewPublicIPAddress() {
-        String dnsLabel = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String dnsLabel = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         return this.fromNewPublicIPAddress(dnsLabel);
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java
index b6b4d0258fb5..fb7f22592b4a 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/LoadBalancingRuleImpl.java
@@ -125,21 +125,21 @@ public LoadBalancingRuleImpl fromExistingPublicIPAddress(String resourceId) {
 
     @Override
     public LoadBalancingRuleImpl fromNewPublicIPAddress(String leafDnsLabel) {
-        String frontendName = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         this.parent().withNewPublicIPAddress(leafDnsLabel, frontendName);
         return fromFrontend(frontendName);
     }
 
     @Override
     public LoadBalancingRuleImpl fromNewPublicIPAddress(Creatable<PublicIpAddress> pipDefinition) {
-        String frontendName = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String frontendName = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         this.parent().withNewPublicIPAddress(pipDefinition, frontendName);
         return fromFrontend(frontendName);
     }
 
     @Override
     public LoadBalancingRuleImpl fromNewPublicIPAddress() {
-        String dnsLabel = this.parent().manager().getSdkContext().randomResourceName("fe", 20);
+        String dnsLabel = this.parent().manager().sdkContext().randomResourceName("fe", 20);
         return this.fromNewPublicIPAddress(dnsLabel);
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java
index 336a40c6c2eb..64ce9d700663 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkImpl.java
@@ -285,7 +285,7 @@ public NetworkImpl withNewDdosProtectionPlan() {
         DdosProtectionPlan.DefinitionStages.WithGroup ddosProtectionPlanWithGroup =
             manager()
                 .ddosProtectionPlans()
-                .define(this.manager().getSdkContext().randomResourceName(name(), 20))
+                .define(this.manager().sdkContext().randomResourceName(name(), 20))
                 .withRegion(region());
         if (super.creatableGroup != null && isInCreateMode()) {
             ddosProtectionPlanCreatable = ddosProtectionPlanWithGroup.withNewResourceGroup(super.creatableGroup);
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java
index 73ca8575441d..850aaf9999d3 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkInterfaceImpl.java
@@ -48,7 +48,7 @@ class NetworkInterfaceImpl
     NetworkInterfaceImpl(String name, NetworkInterfaceInner innerModel, final NetworkManager networkManager) {
         super(name, innerModel, networkManager);
         this.nicName = name;
-        this.namer = this.manager().getSdkContext().getResourceNamerFactory().createResourceNamer(this.nicName);
+        this.namer = this.manager().sdkContext().getResourceNamerFactory().createResourceNamer(this.nicName);
         initializeChildrenFromInner();
     }
 
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java
index 83933c6b7e9a..03104b80f55d 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/NetworkPeeringImpl.java
@@ -373,7 +373,7 @@ protected Mono<NetworkPeering> createChildResourceAsync() {
                                     () -> {
                                         // No matching remote peering, so create one on the remote network
                                         String peeringName =
-                                            this.manager().getSdkContext().randomResourceName("peer", 15);
+                                            this.manager().sdkContext().randomResourceName("peer", 15);
 
                                         WithCreate remotePeeringDefinition =
                                             remoteNetwork
diff --git a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java
index b6fe05e02d31..c44af1ddb0d5 100644
--- a/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java
+++ b/sdk/network/mgmt/src/main/java/com/azure/management/network/implementation/VirtualNetworkGatewayImpl.java
@@ -111,7 +111,7 @@ public VirtualNetworkGatewayImpl withNewNetwork(String name, String addressSpace
     @Override
     public VirtualNetworkGatewayImpl withNewNetwork(String addressSpaceCidr, String subnetAddressSpaceCidr) {
         withNewNetwork(
-            this.manager().getSdkContext().randomResourceName("vnet", 8), addressSpaceCidr, subnetAddressSpaceCidr);
+            this.manager().sdkContext().randomResourceName("vnet", 8), addressSpaceCidr, subnetAddressSpaceCidr);
         return this;
     }
 
@@ -141,7 +141,7 @@ public VirtualNetworkGatewayImpl withNewPublicIpAddress(Creatable<PublicIpAddres
 
     @Override
     public VirtualNetworkGatewayImpl withNewPublicIpAddress() {
-        final String pipName = this.manager().getSdkContext().randomResourceName("pip", 9);
+        final String pipName = this.manager().sdkContext().randomResourceName("pip", 9);
         this.creatablePip =
             this
                 .manager()
@@ -361,7 +361,7 @@ private VirtualNetworkGatewayIpConfigurationImpl ensureDefaultIPConfig() {
         VirtualNetworkGatewayIpConfigurationImpl ipConfig =
             (VirtualNetworkGatewayIpConfigurationImpl) defaultIPConfiguration();
         if (ipConfig == null) {
-            String name = this.manager().getSdkContext().randomResourceName("ipcfg", 11);
+            String name = this.manager().sdkContext().randomResourceName("ipcfg", 11);
             ipConfig = this.defineIPConfiguration(name);
             ipConfig.attach();
         }
@@ -370,7 +370,7 @@ private VirtualNetworkGatewayIpConfigurationImpl ensureDefaultIPConfig() {
 
     private Creatable<PublicIpAddress> ensureDefaultPipDefinition() {
         if (this.creatablePip == null) {
-            final String pipName = this.manager().getSdkContext().randomResourceName("pip", 9);
+            final String pipName = this.manager().sdkContext().randomResourceName("pip", 9);
             this.creatablePip =
                 this
                     .manager()
diff --git a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/implementation/ManagerBase.java b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/implementation/ManagerBase.java
index 69098abeb1cd..5ec680096042 100644
--- a/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/implementation/ManagerBase.java
+++ b/sdk/resources/mgmt/src/main/java/com/azure/management/resources/fluentcore/arm/implementation/ManagerBase.java
@@ -67,7 +67,7 @@ public HttpPipeline httpPipeline() {
     /**
      * @return the {@link SdkContext} associated with this manager
      */
-    public SdkContext getSdkContext() {
+    public SdkContext sdkContext() {
         return this.sdkContext;
     }
 }
diff --git a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java
index 4a19c4ba9605..615f65ddfe07 100644
--- a/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java
+++ b/sdk/sql/mgmt/src/main/java/com/azure/management/sql/implementation/SqlServerImpl.java
@@ -421,7 +421,7 @@ public SqlServerImpl withNewFirewallRule(String ipAddress) {
     public SqlServerImpl withNewFirewallRule(String startIPAddress, String endIPAddress) {
         return this
             .withNewFirewallRule(
-                startIPAddress, endIPAddress, this.manager().getSdkContext().randomResourceName("firewall_", 15));
+                startIPAddress, endIPAddress, this.manager().sdkContext().randomResourceName("firewall_", 15));
     }
 
     @Override