diff --git a/azure-mgmt-netapp/HISTORY.rst b/azure-mgmt-netapp/HISTORY.rst
index aff487fefb26..3ccaa03c1cd0 100644
--- a/azure-mgmt-netapp/HISTORY.rst
+++ b/azure-mgmt-netapp/HISTORY.rst
@@ -3,6 +3,18 @@
 Release History
 ===============
 
+0.2.0 (2019-03-04)
+++++++++++++++++++
+
+**Breaking changes**
+
+- The resource_group parameter in MountTargetsOperations.list has changed to resource_group_name
+- The resource_group parameter in SnapshotsOperations.get has changed to resource_group_name
+- The resource_group parameter in SnapshotsOperations.create has changed to resource_group_name
+- The resource_group parameter in SnapshotsOperations.list has changed to resource_group_name
+- The resource_group parameter in SnapshotsOperations.delete has changed to resource_group_name
+- The resource_group parameter in SnapshotsOperations.update has changed to resource_group_name
+
 0.1.0 (2018-01-02)
 ++++++++++++++++++
 
diff --git a/azure-mgmt-netapp/MANIFEST.in b/azure-mgmt-netapp/MANIFEST.in
index 6ceb27f7a96e..e4884efef41b 100644
--- a/azure-mgmt-netapp/MANIFEST.in
+++ b/azure-mgmt-netapp/MANIFEST.in
@@ -1,3 +1,4 @@
+recursive-include tests *.py *.yaml
 include *.rst
 include azure/__init__.py
 include azure/mgmt/__init__.py
diff --git a/azure-mgmt-netapp/README.rst b/azure-mgmt-netapp/README.rst
index 620bb4e0b12e..03763309da23 100644
--- a/azure-mgmt-netapp/README.rst
+++ b/azure-mgmt-netapp/README.rst
@@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
 
-Compatibility
-=============
-
-**IMPORTANT**: If you have an earlier version of the azure package
-(version < 1.0), you should uninstall it before installing this package.
-
-You can check the version using pip:
-
-.. code:: shell
-
-    pip freeze
-
-If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
-
-.. code:: shell
-
-    pip uninstall azure
-
-
 Usage
 =====
 
diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py
index 19addfef5dfe..da73c1444c8b 100644
--- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py
+++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/accounts_operations.py
@@ -39,11 +39,11 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, resource_group, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, custom_headers=None, raw=False, **operation_config):
         """Lists all NetApp accounts in the resource group.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
          deserialized response
@@ -62,7 +62,7 @@ def internal_paging(next_link=None, raw=False):
                 url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'resourceGroup': self._serialize.url("resource_group", resource_group, 'str')
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
 
@@ -102,14 +102,14 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts'}
 
     def get(
-            self, resource_group, account_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, custom_headers=None, raw=False, **operation_config):
         """Get the NetApp account.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param dict custom_headers: headers that will be added to the request
@@ -127,7 +127,7 @@ def get(
         url = self.get.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -163,18 +163,18 @@ def get(
             return client_raw_response
 
         return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
 
 
     def _create_or_update_initial(
-            self, resource_group, account_name, location, tags=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, location, tags=None, custom_headers=None, raw=False, **operation_config):
         body = models.NetAppAccount(location=location, tags=tags)
 
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -216,11 +216,11 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, resource_group, account_name, location, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, account_name, location, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
         """Create or update a NetApp account.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param location: Resource location
@@ -242,7 +242,7 @@ def create_or_update(
          :class:`ErrorException<azure.mgmt.netapp.models.ErrorException>`
         """
         raw_result = self._create_or_update_initial(
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             location=location,
             tags=tags,
@@ -267,16 +267,16 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
 
 
     def _delete_initial(
-            self, resource_group, account_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.delete.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -306,11 +306,11 @@ def _delete_initial(
             return client_raw_response
 
     def delete(
-            self, resource_group, account_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, account_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a NetApp account.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param dict custom_headers: headers that will be added to the request
@@ -326,7 +326,7 @@ def delete(
          :class:`ErrorException<azure.mgmt.netapp.models.ErrorException>`
         """
         raw_result = self._delete_initial(
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             custom_headers=custom_headers,
             raw=True,
@@ -345,14 +345,14 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
 
     def update(
-            self, resource_group, account_name, tags=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, tags=None, custom_headers=None, raw=False, **operation_config):
         """Patch a NetApp account.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param tags: Resource tags
@@ -374,7 +374,7 @@ def update(
         url = self.update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str')
         }
         url = self._client.format_url(url, **path_format_arguments)
@@ -414,4 +414,4 @@ def update(
             return client_raw_response
 
         return deserialized
-    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}'}
diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/mount_targets_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/mount_targets_operations.py
index a900436b7de9..c0d1b4c86f2f 100644
--- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/mount_targets_operations.py
+++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/mount_targets_operations.py
@@ -37,11 +37,11 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
         """List mount targets.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -66,7 +66,7 @@ def internal_paging(next_link=None, raw=False):
                 url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
                     'accountName': self._serialize.url("account_name", account_name, 'str'),
                     'poolName': self._serialize.url("pool_name", pool_name, 'str'),
                     'volumeName': self._serialize.url("volume_name", volume_name, 'str')
@@ -109,4 +109,4 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets'}
diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py
index 5bf900e3c398..9a523a657aa4 100644
--- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py
+++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/pools_operations.py
@@ -39,11 +39,11 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, resource_group, account_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, custom_headers=None, raw=False, **operation_config):
         """Lists all capacity pools in the NetApp Account.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param dict custom_headers: headers that will be added to the request
@@ -64,7 +64,7 @@ def internal_paging(next_link=None, raw=False):
                 url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
                     'accountName': self._serialize.url("account_name", account_name, 'str')
                 }
                 url = self._client.format_url(url, **path_format_arguments)
@@ -105,14 +105,14 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools'}
 
     def get(
-            self, resource_group, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
         """Get a capacity pool.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -132,7 +132,7 @@ def get(
         url = self.get.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str')
         }
@@ -169,16 +169,16 @@ def get(
             return client_raw_response
 
         return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
 
 
     def _create_or_update_initial(
-            self, body, resource_group, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str')
         }
@@ -223,14 +223,14 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, body, resource_group, account_name, pool_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Create or Update a capacity pool.
 
         :param body: Capacity pool object supplied in the body of the
          operation.
         :type body: ~azure.mgmt.netapp.models.CapacityPool
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -251,7 +251,7 @@ def create_or_update(
         """
         raw_result = self._create_or_update_initial(
             body=body,
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             pool_name=pool_name,
             custom_headers=custom_headers,
@@ -275,14 +275,14 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
 
     def update(
-            self, resource_group, account_name, pool_name, tags=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, tags=None, custom_headers=None, raw=False, **operation_config):
         """Patch a capacity pool.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -306,7 +306,7 @@ def update(
         url = self.update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str')
         }
@@ -347,16 +347,16 @@ def update(
             return client_raw_response
 
         return deserialized
-    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
 
 
     def _delete_initial(
-            self, resource_group, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.delete.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str')
         }
@@ -387,11 +387,11 @@ def _delete_initial(
             return client_raw_response
 
     def delete(
-            self, resource_group, account_name, pool_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a capacity pool.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -409,7 +409,7 @@ def delete(
          :class:`ErrorException<azure.mgmt.netapp.models.ErrorException>`
         """
         raw_result = self._delete_initial(
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             pool_name=pool_name,
             custom_headers=custom_headers,
@@ -429,4 +429,4 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}'}
diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py
index 9216a465f1b4..1b003e85a6d2 100644
--- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py
+++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/snapshots_operations.py
@@ -39,11 +39,11 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
         """List snapshots.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -68,7 +68,7 @@ def internal_paging(next_link=None, raw=False):
                 url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
                     'accountName': self._serialize.url("account_name", account_name, 'str'),
                     'poolName': self._serialize.url("pool_name", pool_name, 'str'),
                     'volumeName': self._serialize.url("volume_name", volume_name, 'str')
@@ -111,14 +111,14 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots'}
 
     def get(
-            self, resource_group, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
         """Get a snapshot.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -142,7 +142,7 @@ def get(
         url = self.get.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str'),
@@ -181,16 +181,16 @@ def get(
             return client_raw_response
 
         return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
 
 
     def _create_initial(
-            self, body, resource_group, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str'),
@@ -235,13 +235,13 @@ def _create_initial(
         return deserialized
 
     def create(
-            self, body, resource_group, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Create a snapshot.
 
         :param body: Snapshot object supplied in the body of the operation.
         :type body: ~azure.mgmt.netapp.models.Snapshot
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -266,7 +266,7 @@ def create(
         """
         raw_result = self._create_initial(
             body=body,
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             pool_name=pool_name,
             volume_name=volume_name,
@@ -292,14 +292,14 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
+    create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
 
     def update(
-            self, resource_group, account_name, pool_name, volume_name, snapshot_name, tags=None, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, snapshot_name, tags=None, custom_headers=None, raw=False, **operation_config):
         """Patch a snapshot.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -327,7 +327,7 @@ def update(
         url = self.update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str'),
@@ -370,16 +370,16 @@ def update(
             return client_raw_response
 
         return deserialized
-    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
 
 
     def _delete_initial(
-            self, resource_group, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.delete.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str'),
@@ -412,11 +412,11 @@ def _delete_initial(
             return client_raw_response
 
     def delete(
-            self, resource_group, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, snapshot_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete snapshot.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -438,7 +438,7 @@ def delete(
          :class:`ErrorException<azure.mgmt.netapp.models.ErrorException>`
         """
         raw_result = self._delete_initial(
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             pool_name=pool_name,
             volume_name=volume_name,
@@ -460,4 +460,4 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}'}
diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/operations/volumes_operations.py b/azure-mgmt-netapp/azure/mgmt/netapp/operations/volumes_operations.py
index c31c39a6abfb..663aa86b58d4 100644
--- a/azure-mgmt-netapp/azure/mgmt/netapp/operations/volumes_operations.py
+++ b/azure-mgmt-netapp/azure/mgmt/netapp/operations/volumes_operations.py
@@ -39,11 +39,11 @@ def __init__(self, client, config, serializer, deserializer):
         self.config = config
 
     def list(
-            self, resource_group, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, custom_headers=None, raw=False, **operation_config):
         """List volumes.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -66,7 +66,7 @@ def internal_paging(next_link=None, raw=False):
                 url = self.list.metadata['url']
                 path_format_arguments = {
                     'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-                    'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+                    'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
                     'accountName': self._serialize.url("account_name", account_name, 'str'),
                     'poolName': self._serialize.url("pool_name", pool_name, 'str')
                 }
@@ -108,14 +108,14 @@ def internal_paging(next_link=None, raw=False):
             return client_raw_response
 
         return deserialized
-    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes'}
+    list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes'}
 
     def get(
-            self, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
         """Get a volume.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -137,7 +137,7 @@ def get(
         url = self.get.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str')
@@ -175,16 +175,16 @@ def get(
             return client_raw_response
 
         return deserialized
-    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
+    get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
 
 
     def _create_or_update_initial(
-            self, body, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str')
@@ -230,13 +230,13 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, body, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Create or update a volume.
 
         :param body: Volume object supplied in the body of the operation.
         :type body: ~azure.mgmt.netapp.models.Volume
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -259,7 +259,7 @@ def create_or_update(
         """
         raw_result = self._create_or_update_initial(
             body=body,
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             pool_name=pool_name,
             volume_name=volume_name,
@@ -284,16 +284,16 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
+    create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
 
     def update(
-            self, body, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
+            self, body, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
         """Patch a volume.
 
         :param body: Volume object supplied in the body of the operation.
         :type body: ~azure.mgmt.netapp.models.VolumePatch
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -315,7 +315,7 @@ def update(
         url = self.update.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str')
@@ -357,16 +357,16 @@ def update(
             return client_raw_response
 
         return deserialized
-    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
+    update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
 
 
     def _delete_initial(
-            self, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.delete.metadata['url']
         path_format_arguments = {
             'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'),
-            'resourceGroup': self._serialize.url("resource_group", resource_group, 'str'),
+            'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
             'accountName': self._serialize.url("account_name", account_name, 'str'),
             'poolName': self._serialize.url("pool_name", pool_name, 'str'),
             'volumeName': self._serialize.url("volume_name", volume_name, 'str')
@@ -398,11 +398,11 @@ def _delete_initial(
             return client_raw_response
 
     def delete(
-            self, resource_group, account_name, pool_name, volume_name, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, account_name, pool_name, volume_name, custom_headers=None, raw=False, polling=True, **operation_config):
         """Delete a volume.
 
-        :param resource_group: The name of the resource group.
-        :type resource_group: str
+        :param resource_group_name: The name of the resource group.
+        :type resource_group_name: str
         :param account_name: The name of the NetApp account
         :type account_name: str
         :param pool_name: The name of the capacity pool
@@ -422,7 +422,7 @@ def delete(
          :class:`ErrorException<azure.mgmt.netapp.models.ErrorException>`
         """
         raw_result = self._delete_initial(
-            resource_group=resource_group,
+            resource_group_name=resource_group_name,
             account_name=account_name,
             pool_name=pool_name,
             volume_name=volume_name,
@@ -443,4 +443,4 @@ def get_long_running_output(response):
         elif polling is False: polling_method = NoPolling()
         else: polling_method = polling
         return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
-    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
+    delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}'}
diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/version.py b/azure-mgmt-netapp/azure/mgmt/netapp/version.py
index e0ec669828cb..c995f7836cef 100644
--- a/azure-mgmt-netapp/azure/mgmt/netapp/version.py
+++ b/azure-mgmt-netapp/azure/mgmt/netapp/version.py
@@ -9,5 +9,4 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.1.0"
-
+VERSION = "0.2.0"