diff --git a/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md b/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md
index 4e4f1266599c..0310fb7b1ed4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md
+++ b/sdk/netapp/azure-resourcemanager-netapp/CHANGELOG.md
@@ -1,5 +1,5 @@
 # Release History
 
-## 1.0.0-beta.1 (2021-02-18)
+## 1.0.0-beta.1 (2021-02-19)
 
-- Azure Resource Manager NetApp Files client library for Java. This package contains Microsoft Azure SDK for NetApp Files Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2020-11-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+- Azure Resource Manager NetAppFiles client library for Java. This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetAppFiles Azure Resource Provider specification. Package tag package-netapp-2020-11-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
diff --git a/sdk/netapp/azure-resourcemanager-netapp/README.md b/sdk/netapp/azure-resourcemanager-netapp/README.md
index 367e7b56426c..82943e7da751 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/README.md
+++ b/sdk/netapp/azure-resourcemanager-netapp/README.md
@@ -1,8 +1,8 @@
-# Azure Resource Manager NetApp Files client library for Java
+# Azure Resource Manager NetAppFiles client library for Java
 
-Azure Resource Manager NetApp Files client library for Java.
+Azure Resource Manager NetAppFiles client library for Java.
 
-This package contains Microsoft Azure SDK for NetApp Files Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2020-11-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
+This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetAppFiles Azure Resource Provider specification. Package tag package-netapp-2020-11-01. For documentation on how to use this package, please see [Azure Management Libraries for Java](https://aka.ms/azsdk/java/mgmt).
 
 ## We'd love to hear your feedback
 
@@ -60,7 +60,7 @@ AzureProfile profile = new AzureProfile(AzureEnvironment.AZURE);
 TokenCredential credential = new DefaultAzureCredentialBuilder()
     .authorityHost(profile.getEnvironment().getActiveDirectoryEndpoint())
     .build();
-NetAppManager manager = NetAppManager
+NetAppFilesManager manager = NetAppFilesManager
     .authenticate(credential, profile);
 ```
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/pom.xml b/sdk/netapp/azure-resourcemanager-netapp/pom.xml
index 1d961dda5bf5..d1963339272b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/pom.xml
+++ b/sdk/netapp/azure-resourcemanager-netapp/pom.xml
@@ -12,8 +12,8 @@
     <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-netapp;current} -->
     <packaging>jar</packaging>
 
-    <name>Microsoft Azure SDK for NetApp Files Management</name>
-    <description>This package contains Microsoft Azure SDK for NetApp Files Management SDK. Microsoft NetApp Files Azure Resource Provider specification. Package tag package-netapp-2020-11-01. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt</description>
+    <name>Microsoft Azure SDK for NetAppFiles Management</name>
+    <description>This package contains Microsoft Azure SDK for NetAppFiles Management SDK. Microsoft NetAppFiles Azure Resource Provider specification. Package tag package-netapp-2020-11-01. For documentation on how to use this package, please see https://aka.ms/azsdk/java/mgmt</description>
     <url>https://github.com/Azure/azure-sdk-for-java</url>
 
     <licenses>
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppManager.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java
similarity index 93%
rename from sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppManager.java
rename to sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java
index 42303b91ab43..81a981a38b40 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppManager.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/NetAppFilesManager.java
@@ -50,8 +50,8 @@
 import java.util.List;
 import java.util.Objects;
 
-/** Entry point to NetAppManager. Microsoft NetApp Azure Resource Provider specification. */
-public final class NetAppManager {
+/** Entry point to NetAppFilesManager. Microsoft NetAppFiles Azure Resource Provider specification. */
+public final class NetAppFilesManager {
     private Operations operations;
 
     private NetAppResources netAppResources;
@@ -76,7 +76,7 @@ public final class NetAppManager {
 
     private final NetAppManagementClient clientObject;
 
-    private NetAppManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
+    private NetAppFilesManager(HttpPipeline httpPipeline, AzureProfile profile, Duration defaultPollInterval) {
         Objects.requireNonNull(httpPipeline, "'httpPipeline' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
         this.clientObject =
@@ -89,25 +89,25 @@ private NetAppManager(HttpPipeline httpPipeline, AzureProfile profile, Duration
     }
 
     /**
-     * Creates an instance of NetApp service API entry point.
+     * Creates an instance of NetAppFiles service API entry point.
      *
      * @param credential the credential to use.
      * @param profile the Azure profile for client.
-     * @return the NetApp service API instance.
+     * @return the NetAppFiles service API instance.
      */
-    public static NetAppManager authenticate(TokenCredential credential, AzureProfile profile) {
+    public static NetAppFilesManager authenticate(TokenCredential credential, AzureProfile profile) {
         Objects.requireNonNull(credential, "'credential' cannot be null.");
         Objects.requireNonNull(profile, "'profile' cannot be null.");
         return configure().authenticate(credential, profile);
     }
 
     /**
-     * Gets a Configurable instance that can be used to create NetAppManager with optional configuration.
+     * Gets a Configurable instance that can be used to create NetAppFilesManager with optional configuration.
      *
      * @return the Configurable instance allowing configurations.
      */
     public static Configurable configure() {
-        return new NetAppManager.Configurable();
+        return new NetAppFilesManager.Configurable();
     }
 
     /** The Configurable allowing configurations to be set. */
@@ -182,13 +182,13 @@ public Configurable withDefaultPollInterval(Duration defaultPollInterval) {
         }
 
         /**
-         * Creates an instance of NetApp service API entry point.
+         * Creates an instance of NetAppFiles service API entry point.
          *
          * @param credential the credential to use.
          * @param profile the Azure profile for client.
-         * @return the NetApp service API instance.
+         * @return the NetAppFiles service API instance.
          */
-        public NetAppManager authenticate(TokenCredential credential, AzureProfile profile) {
+        public NetAppFilesManager authenticate(TokenCredential credential, AzureProfile profile) {
             Objects.requireNonNull(credential, "'credential' cannot be null.");
             Objects.requireNonNull(profile, "'profile' cannot be null.");
 
@@ -232,7 +232,7 @@ public NetAppManager authenticate(TokenCredential credential, AzureProfile profi
                     .httpClient(httpClient)
                     .policies(policies.toArray(new HttpPipelinePolicy[0]))
                     .build();
-            return new NetAppManager(httpPipeline, profile, defaultPollInterval);
+            return new NetAppFilesManager(httpPipeline, profile, defaultPollInterval);
         }
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/package-info.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/package-info.java
index 06d97c6bbef4..21aa38d11dbe 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/package-info.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/models/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * Package containing the inner data models for NetAppManagementClient. Microsoft NetApp Azure Resource Provider
+ * Package containing the inner data models for NetAppManagementClient. Microsoft NetAppFiles Azure Resource Provider
  * specification.
  */
 package com.azure.resourcemanager.netapp.fluent.models;
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/package-info.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/package-info.java
index 96eacc2be004..a199b04d667c 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/package-info.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/fluent/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * Package containing the service clients for NetAppManagementClient. Microsoft NetApp Azure Resource Provider
+ * Package containing the service clients for NetAppManagementClient. Microsoft NetAppFiles Azure Resource Provider
  * specification.
  */
 package com.azure.resourcemanager.netapp.fluent;
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountBackupsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountBackupsImpl.java
index bdc47bbb35be..df2af6458457 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountBackupsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountBackupsImpl.java
@@ -8,7 +8,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.AccountBackupsClient;
 import com.azure.resourcemanager.netapp.fluent.models.BackupInner;
 import com.azure.resourcemanager.netapp.fluent.models.BackupsListInner;
@@ -22,9 +22,9 @@ public final class AccountBackupsImpl implements AccountBackups {
 
     private final AccountBackupsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public AccountBackupsImpl(AccountBackupsClient innerClient, NetAppManager serviceManager) {
+    public AccountBackupsImpl(AccountBackupsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -88,7 +88,7 @@ private AccountBackupsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountsImpl.java
index 3343b5d6ac19..9098f96a3bdb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/AccountsImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.AccountsClient;
 import com.azure.resourcemanager.netapp.fluent.models.NetAppAccountInner;
 import com.azure.resourcemanager.netapp.models.Accounts;
@@ -21,9 +21,9 @@ public final class AccountsImpl implements Accounts {
 
     private final AccountsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public AccountsImpl(AccountsClient innerClient, NetAppManager serviceManager) {
+    public AccountsImpl(AccountsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -154,7 +154,7 @@ private AccountsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupImpl.java
index 5f0fe0adef7f..884b2ffa0e35 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.BackupInner;
 import com.azure.resourcemanager.netapp.models.Backup;
 import com.azure.resourcemanager.netapp.models.BackupPatch;
@@ -16,7 +16,7 @@
 public final class BackupImpl implements Backup, Backup.Definition, Backup.Update {
     private BackupInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -74,7 +74,7 @@ public BackupInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -118,7 +118,7 @@ public Backup create(Context context) {
         return this;
     }
 
-    BackupImpl(String name, NetAppManager serviceManager) {
+    BackupImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new BackupInner();
         this.serviceManager = serviceManager;
         this.backupName = name;
@@ -147,7 +147,7 @@ public Backup apply(Context context) {
         return this;
     }
 
-    BackupImpl(BackupInner innerObject, NetAppManager serviceManager) {
+    BackupImpl(BackupInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPoliciesImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPoliciesImpl.java
index facd1b3272a0..5048dabf8aa7 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPoliciesImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPoliciesImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.BackupPoliciesClient;
 import com.azure.resourcemanager.netapp.fluent.models.BackupPolicyInner;
 import com.azure.resourcemanager.netapp.models.BackupPolicies;
@@ -21,9 +21,9 @@ public final class BackupPoliciesImpl implements BackupPolicies {
 
     private final BackupPoliciesClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public BackupPoliciesImpl(BackupPoliciesClient innerClient, NetAppManager serviceManager) {
+    public BackupPoliciesImpl(BackupPoliciesClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -186,7 +186,7 @@ private BackupPoliciesClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPolicyImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPolicyImpl.java
index ada5024751e8..0e851b577edb 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPolicyImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupPolicyImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.BackupPolicyInner;
 import com.azure.resourcemanager.netapp.models.BackupPolicy;
 import com.azure.resourcemanager.netapp.models.BackupPolicyPatch;
@@ -18,7 +18,7 @@
 public final class BackupPolicyImpl implements BackupPolicy, BackupPolicy.Definition, BackupPolicy.Update {
     private BackupPolicyInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -94,7 +94,7 @@ public BackupPolicyInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -130,7 +130,7 @@ public BackupPolicy create(Context context) {
         return this;
     }
 
-    BackupPolicyImpl(String name, NetAppManager serviceManager) {
+    BackupPolicyImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new BackupPolicyInner();
         this.serviceManager = serviceManager;
         this.backupPolicyName = name;
@@ -161,7 +161,7 @@ public BackupPolicy apply(Context context) {
         return this;
     }
 
-    BackupPolicyImpl(BackupPolicyInner innerObject, NetAppManager serviceManager) {
+    BackupPolicyImpl(BackupPolicyInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsImpl.java
index 3c0c24602c1e..64d01b6d5add 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.BackupsClient;
 import com.azure.resourcemanager.netapp.fluent.models.BackupInner;
 import com.azure.resourcemanager.netapp.models.Backup;
@@ -21,9 +21,9 @@ public final class BackupsImpl implements Backups {
 
     private final BackupsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public BackupsImpl(BackupsClient innerClient, NetAppManager serviceManager) {
+    public BackupsImpl(BackupsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -259,7 +259,7 @@ private BackupsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsListImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsListImpl.java
index 103d8cc2f812..1da1cf0da926 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsListImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/BackupsListImpl.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.netapp.implementation;
 
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.BackupInner;
 import com.azure.resourcemanager.netapp.fluent.models.BackupsListInner;
 import com.azure.resourcemanager.netapp.models.Backup;
@@ -16,9 +16,9 @@
 public final class BackupsListImpl implements BackupsList {
     private BackupsListInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    BackupsListImpl(BackupsListInner innerObject, NetAppManager serviceManager) {
+    BackupsListImpl(BackupsListInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -38,7 +38,7 @@ public BackupsListInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CapacityPoolImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CapacityPoolImpl.java
index 836c71b0b4a4..1ecd87ee0e0d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CapacityPoolImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CapacityPoolImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.CapacityPoolInner;
 import com.azure.resourcemanager.netapp.models.CapacityPool;
 import com.azure.resourcemanager.netapp.models.CapacityPoolPatch;
@@ -18,7 +18,7 @@
 public final class CapacityPoolImpl implements CapacityPool, CapacityPool.Definition, CapacityPool.Update {
     private CapacityPoolInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -85,7 +85,7 @@ public CapacityPoolInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -121,7 +121,7 @@ public CapacityPool create(Context context) {
         return this;
     }
 
-    CapacityPoolImpl(String name, NetAppManager serviceManager) {
+    CapacityPoolImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new CapacityPoolInner();
         this.serviceManager = serviceManager;
         this.poolName = name;
@@ -150,7 +150,7 @@ public CapacityPool apply(Context context) {
         return this;
     }
 
-    CapacityPoolImpl(CapacityPoolInner innerObject, NetAppManager serviceManager) {
+    CapacityPoolImpl(CapacityPoolInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CheckAvailabilityResponseImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CheckAvailabilityResponseImpl.java
index ec2c7a7816e9..819c833a3ef1 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CheckAvailabilityResponseImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/CheckAvailabilityResponseImpl.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.netapp.implementation;
 
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.CheckAvailabilityResponseInner;
 import com.azure.resourcemanager.netapp.models.CheckAvailabilityResponse;
 import com.azure.resourcemanager.netapp.models.InAvailabilityReasonType;
@@ -12,9 +12,9 @@
 public final class CheckAvailabilityResponseImpl implements CheckAvailabilityResponse {
     private CheckAvailabilityResponseInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    CheckAvailabilityResponseImpl(CheckAvailabilityResponseInner innerObject, NetAppManager serviceManager) {
+    CheckAvailabilityResponseImpl(CheckAvailabilityResponseInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -35,7 +35,7 @@ public CheckAvailabilityResponseInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java
index c9133b803339..8dba607a3177 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppAccountImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.NetAppAccountInner;
 import com.azure.resourcemanager.netapp.models.AccountEncryption;
 import com.azure.resourcemanager.netapp.models.ActiveDirectory;
@@ -20,7 +20,7 @@
 public final class NetAppAccountImpl implements NetAppAccount, NetAppAccount.Definition, NetAppAccount.Update {
     private NetAppAccountInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -80,7 +80,7 @@ public NetAppAccountInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -113,7 +113,7 @@ public NetAppAccount create(Context context) {
         return this;
     }
 
-    NetAppAccountImpl(String name, NetAppManager serviceManager) {
+    NetAppAccountImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new NetAppAccountInner();
         this.serviceManager = serviceManager;
         this.accountName = name;
@@ -139,7 +139,7 @@ public NetAppAccount apply(Context context) {
         return this;
     }
 
-    NetAppAccountImpl(NetAppAccountInner innerObject, NetAppManager serviceManager) {
+    NetAppAccountImpl(NetAppAccountInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourcesImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourcesImpl.java
index 227342c4828d..7c64a71e9e3d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourcesImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/NetAppResourcesImpl.java
@@ -8,7 +8,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.NetAppResourcesClient;
 import com.azure.resourcemanager.netapp.fluent.models.CheckAvailabilityResponseInner;
 import com.azure.resourcemanager.netapp.models.CheckAvailabilityResponse;
@@ -22,9 +22,9 @@ public final class NetAppResourcesImpl implements NetAppResources {
 
     private final NetAppResourcesClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public NetAppResourcesImpl(NetAppResourcesClient innerClient, NetAppManager serviceManager) {
+    public NetAppResourcesImpl(NetAppResourcesClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -105,7 +105,7 @@ private NetAppResourcesClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationImpl.java
index 507d9a346ddb..4e6da5ceb303 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationImpl.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.netapp.implementation;
 
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.OperationInner;
 import com.azure.resourcemanager.netapp.models.Operation;
 import com.azure.resourcemanager.netapp.models.OperationDisplay;
@@ -13,9 +13,9 @@
 public final class OperationImpl implements Operation {
     private OperationInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    OperationImpl(OperationInner innerObject, NetAppManager serviceManager) {
+    OperationImpl(OperationInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -40,7 +40,7 @@ public OperationInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationsImpl.java
index c1b0bc9b3662..55e91bcbcbe4 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/OperationsImpl.java
@@ -7,7 +7,7 @@
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.OperationsClient;
 import com.azure.resourcemanager.netapp.fluent.models.OperationInner;
 import com.azure.resourcemanager.netapp.models.Operation;
@@ -19,9 +19,9 @@ public final class OperationsImpl implements Operations {
 
     private final OperationsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public OperationsImpl(OperationsClient innerClient, NetAppManager serviceManager) {
+    public OperationsImpl(OperationsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -40,7 +40,7 @@ private OperationsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/PoolsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/PoolsImpl.java
index 720c31d4ed6a..9842298ddeb1 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/PoolsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/PoolsImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.PoolsClient;
 import com.azure.resourcemanager.netapp.fluent.models.CapacityPoolInner;
 import com.azure.resourcemanager.netapp.models.CapacityPool;
@@ -21,9 +21,9 @@ public final class PoolsImpl implements Pools {
 
     private final PoolsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public PoolsImpl(PoolsClient innerClient, NetAppManager serviceManager) {
+    public PoolsImpl(PoolsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -182,7 +182,7 @@ private PoolsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ReplicationStatusImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ReplicationStatusImpl.java
index c5f6269476ba..ccac5efa63d5 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ReplicationStatusImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/ReplicationStatusImpl.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.netapp.implementation;
 
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationStatusInner;
 import com.azure.resourcemanager.netapp.models.MirrorState;
 import com.azure.resourcemanager.netapp.models.RelationshipStatus;
@@ -13,9 +13,9 @@
 public final class ReplicationStatusImpl implements ReplicationStatus {
     private ReplicationStatusInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    ReplicationStatusImpl(ReplicationStatusInner innerObject, NetAppManager serviceManager) {
+    ReplicationStatusImpl(ReplicationStatusInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -44,7 +44,7 @@ public ReplicationStatusInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotImpl.java
index 84411572c37f..f3eab308a5dd 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.SnapshotInner;
 import com.azure.resourcemanager.netapp.models.Snapshot;
 import java.time.OffsetDateTime;
@@ -14,9 +14,9 @@
 public final class SnapshotImpl implements Snapshot, Snapshot.Definition {
     private SnapshotInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    SnapshotImpl(SnapshotInner innerObject, NetAppManager serviceManager) {
+    SnapshotImpl(SnapshotInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -61,7 +61,7 @@ public SnapshotInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -109,7 +109,7 @@ public Snapshot create(Context context) {
         return this;
     }
 
-    SnapshotImpl(String name, NetAppManager serviceManager) {
+    SnapshotImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new SnapshotInner();
         this.serviceManager = serviceManager;
         this.snapshotName = name;
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPoliciesImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPoliciesImpl.java
index 47cb93fbb22f..b3902c157048 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPoliciesImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPoliciesImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.SnapshotPoliciesClient;
 import com.azure.resourcemanager.netapp.fluent.models.SnapshotPolicyInner;
 import com.azure.resourcemanager.netapp.fluent.models.SnapshotPolicyVolumeListInner;
@@ -23,9 +23,9 @@ public final class SnapshotPoliciesImpl implements SnapshotPolicies {
 
     private final SnapshotPoliciesClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public SnapshotPoliciesImpl(SnapshotPoliciesClient innerClient, NetAppManager serviceManager) {
+    public SnapshotPoliciesImpl(SnapshotPoliciesClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -218,7 +218,7 @@ private SnapshotPoliciesClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyImpl.java
index 3f1017119334..b0bacf83d732 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.SnapshotPolicyInner;
 import com.azure.resourcemanager.netapp.models.DailySchedule;
 import com.azure.resourcemanager.netapp.models.HourlySchedule;
@@ -20,7 +20,7 @@
 public final class SnapshotPolicyImpl implements SnapshotPolicy, SnapshotPolicy.Definition, SnapshotPolicy.Update {
     private SnapshotPolicyInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -83,7 +83,7 @@ public SnapshotPolicyInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -121,7 +121,7 @@ public SnapshotPolicy create(Context context) {
         return this;
     }
 
-    SnapshotPolicyImpl(String name, NetAppManager serviceManager) {
+    SnapshotPolicyImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new SnapshotPolicyInner();
         this.serviceManager = serviceManager;
         this.snapshotPolicyName = name;
@@ -150,7 +150,7 @@ public SnapshotPolicy apply(Context context) {
         return this;
     }
 
-    SnapshotPolicyImpl(SnapshotPolicyInner innerObject, NetAppManager serviceManager) {
+    SnapshotPolicyImpl(SnapshotPolicyInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyVolumeListImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyVolumeListImpl.java
index 5e5fa159fddd..39720f574669 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyVolumeListImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotPolicyVolumeListImpl.java
@@ -4,7 +4,7 @@
 
 package com.azure.resourcemanager.netapp.implementation;
 
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.SnapshotPolicyVolumeListInner;
 import com.azure.resourcemanager.netapp.models.SnapshotPolicyVolumeList;
 import java.util.Collections;
@@ -13,9 +13,9 @@
 public final class SnapshotPolicyVolumeListImpl implements SnapshotPolicyVolumeList {
     private SnapshotPolicyVolumeListInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    SnapshotPolicyVolumeListImpl(SnapshotPolicyVolumeListInner innerObject, NetAppManager serviceManager) {
+    SnapshotPolicyVolumeListImpl(SnapshotPolicyVolumeListInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -33,7 +33,7 @@ public SnapshotPolicyVolumeListInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotsImpl.java
index 5080bc4fa3a8..e44888f4831f 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/SnapshotsImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.SnapshotsClient;
 import com.azure.resourcemanager.netapp.fluent.models.SnapshotInner;
 import com.azure.resourcemanager.netapp.models.Snapshot;
@@ -21,9 +21,9 @@ public final class SnapshotsImpl implements Snapshots {
 
     private final SnapshotsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public SnapshotsImpl(SnapshotsClient innerClient, NetAppManager serviceManager) {
+    public SnapshotsImpl(SnapshotsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -295,7 +295,7 @@ private SnapshotsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultImpl.java
index a982b0b68429..4b1eb6b15a5e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultImpl.java
@@ -4,16 +4,16 @@
 
 package com.azure.resourcemanager.netapp.implementation;
 
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.VaultInner;
 import com.azure.resourcemanager.netapp.models.Vault;
 
 public final class VaultImpl implements Vault {
     private VaultInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    VaultImpl(VaultInner innerObject, NetAppManager serviceManager) {
+    VaultImpl(VaultInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
     }
@@ -42,7 +42,7 @@ public VaultInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultsImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultsImpl.java
index 841a06dc324c..c79f43d9425d 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultsImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VaultsImpl.java
@@ -7,7 +7,7 @@
 import com.azure.core.http.rest.PagedIterable;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.VaultsClient;
 import com.azure.resourcemanager.netapp.fluent.models.VaultInner;
 import com.azure.resourcemanager.netapp.models.Vault;
@@ -19,9 +19,9 @@ public final class VaultsImpl implements Vaults {
 
     private final VaultsClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public VaultsImpl(VaultsClient innerClient, NetAppManager serviceManager) {
+    public VaultsImpl(VaultsClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -40,7 +40,7 @@ private VaultsClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 }
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java
index aafffa6c202d..425bcc714e50 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumeImpl.java
@@ -6,7 +6,7 @@
 
 import com.azure.core.management.Region;
 import com.azure.core.util.Context;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.models.VolumeInner;
 import com.azure.resourcemanager.netapp.models.AuthorizeRequest;
 import com.azure.resourcemanager.netapp.models.BreakReplicationRequest;
@@ -28,7 +28,7 @@
 public final class VolumeImpl implements Volume, Volume.Definition, Volume.Update {
     private VolumeInner innerObject;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
     public String id() {
         return this.innerModel().id();
@@ -165,7 +165,7 @@ public VolumeInner innerModel() {
         return this.innerObject;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
@@ -204,7 +204,7 @@ public Volume create(Context context) {
         return this;
     }
 
-    VolumeImpl(String name, NetAppManager serviceManager) {
+    VolumeImpl(String name, NetAppFilesManager serviceManager) {
         this.innerObject = new VolumeInner();
         this.serviceManager = serviceManager;
         this.volumeName = name;
@@ -233,7 +233,7 @@ public Volume apply(Context context) {
         return this;
     }
 
-    VolumeImpl(VolumeInner innerObject, NetAppManager serviceManager) {
+    VolumeImpl(VolumeInner innerObject, NetAppFilesManager serviceManager) {
         this.innerObject = innerObject;
         this.serviceManager = serviceManager;
         this.resourceGroupName = Utils.getValueFromIdByName(innerObject.id(), "resourceGroups");
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java
index 61b96bb2763e..d6af794ede1e 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/VolumesImpl.java
@@ -9,7 +9,7 @@
 import com.azure.core.http.rest.SimpleResponse;
 import com.azure.core.util.Context;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.resourcemanager.netapp.NetAppManager;
+import com.azure.resourcemanager.netapp.NetAppFilesManager;
 import com.azure.resourcemanager.netapp.fluent.VolumesClient;
 import com.azure.resourcemanager.netapp.fluent.models.ReplicationStatusInner;
 import com.azure.resourcemanager.netapp.fluent.models.VolumeInner;
@@ -27,9 +27,9 @@ public final class VolumesImpl implements Volumes {
 
     private final VolumesClient innerClient;
 
-    private final NetAppManager serviceManager;
+    private final NetAppFilesManager serviceManager;
 
-    public VolumesImpl(VolumesClient innerClient, NetAppManager serviceManager) {
+    public VolumesImpl(VolumesClient innerClient, NetAppFilesManager serviceManager) {
         this.innerClient = innerClient;
         this.serviceManager = serviceManager;
     }
@@ -341,7 +341,7 @@ private VolumesClient serviceClient() {
         return this.innerClient;
     }
 
-    private NetAppManager manager() {
+    private NetAppFilesManager manager() {
         return this.serviceManager;
     }
 
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/package-info.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/package-info.java
index 7c6d62ef87c6..2ff26c71d7dc 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/package-info.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/implementation/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * Package containing the implementations for NetAppManagementClient. Microsoft NetApp Azure Resource Provider
+ * Package containing the implementations for NetAppManagementClient. Microsoft NetAppFiles Azure Resource Provider
  * specification.
  */
 package com.azure.resourcemanager.netapp.implementation;
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/package-info.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/package-info.java
index 0642f16d54d1..ba0dda43f357 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/package-info.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/models/package-info.java
@@ -3,7 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * Package containing the data models for NetAppManagementClient. Microsoft NetApp Azure Resource Provider
+ * Package containing the data models for NetAppManagementClient. Microsoft NetAppFiles Azure Resource Provider
  * specification.
  */
 package com.azure.resourcemanager.netapp.models;
diff --git a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/package-info.java b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/package-info.java
index 074807304b77..396b375c558b 100644
--- a/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/package-info.java
+++ b/sdk/netapp/azure-resourcemanager-netapp/src/main/java/com/azure/resourcemanager/netapp/package-info.java
@@ -3,6 +3,7 @@
 // Code generated by Microsoft (R) AutoRest Code Generator.
 
 /**
- * Package containing the classes for NetAppManagementClient. Microsoft NetApp Azure Resource Provider specification.
+ * Package containing the classes for NetAppManagementClient. Microsoft NetAppFiles Azure Resource Provider
+ * specification.
  */
 package com.azure.resourcemanager.netapp;