diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json
index 927adc27928e..c60a0a23b150 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_CreateOrUpdate.json
@@ -7,11 +7,10 @@
     "body": {}
   },
   "responses": {
-    "200": {
+    "201": {
       "body": {
         "location": "eastus",
         "properties": {
-          "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "provisioningState": "Created"
         }
       }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json
index 1a2a98020a18..5147ae612456 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Get.json
@@ -10,7 +10,6 @@
       "body": {
           "location": "eastus",
           "properties": {
-            "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
             "provisioningState": "Created"
           }
       }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json
index 84191dc2bc71..f1f7d17d6077 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_List.json
@@ -11,7 +11,6 @@
           {
             "location": "eastus",
             "properties": {
-              "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
               "provisioningState": "Created"
             }
           }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json
index 157edf9f1627..c03d2dd45953 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Accounts_Update.json
@@ -11,7 +11,6 @@
       "body": {
         "location": "eastus",
         "properties": {
-          "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "provisioningState": "Created"
         }
       }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json
deleted file mode 100644
index 5ba8004905e4..000000000000
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Delete.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "parameters": {
-    "subscriptionId": "subscriptionId",
-    "resourceGroup": "resourceGroup",
-    "accountName": "accountName",
-    "poolName": "poolName",
-    "volumeName": "volumeName",
-    "mountTargetName": "mountTargetName",
-    "api-version": "2017-08-15"
-  },
-  "responses": {
-    "204": {},
-    "202": {}
-  }
-}
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json
index 8bc21a197dcd..bcd4a56f85b9 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_List.json
@@ -16,7 +16,6 @@
             "properties": {
               "endIp": "1.2.3.4",
               "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333",
-              "name": "mountTarget1",
               "startIp": "1.2.3.4",
               "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
               "vlanId": 1337,
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json
index c3b0ff61a100..963096c1c441 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_CreateOrUpdate.json
@@ -12,14 +12,24 @@
       "body": {
         "location": "eastus",
         "properties": {
-          "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "provisioningState": "Created",
           "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "serviceLevel": "Premium",
-          "size": 12345
+          "size": 4398046511104
         }
       }
-    }, 
+    },
+    "201": {
+      "body": {
+        "location": "eastus",
+        "properties": {
+          "provisioningState": "Created",
+          "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
+          "serviceLevel": "Premium",
+          "size": 4398046511104
+        }
+      }
+    },
     "202": {}
   }
 }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json
index 326433caa272..25aed0d6e384 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Get.json
@@ -11,11 +11,10 @@
       "body": {
         "location": "eastus",
         "properties": {
-          "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "provisioningState": "Created",
           "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "serviceLevel": "Premium",
-          "size": 12345
+          "size": 4398046511104
         }
       }
     }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json
index e4dbb0624a0a..5bccee6836c3 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_List.json
@@ -12,11 +12,10 @@
           {
             "location": "eastus",
             "properties": {
-              "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
               "provisioningState": "Created",
               "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
               "serviceLevel": "Premium",
-              "size": 12345
+              "size": 4398046511104
             }
           }
         ]
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json
index 2dfb6f0d7166..6a8308ab5fc0 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Pools_Update.json
@@ -12,11 +12,10 @@
       "body": {
         "location": "eastus",
         "properties": {
-          "accountId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "provisioningState": "Created",
           "poolId": "9760acf5-4638-11e7-9bdb-020073ca7778",
           "serviceLevel": "Premium",
-          "size": 12345
+          "size": 4398046511104
         }
       }
     }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json
new file mode 100644
index 000000000000..8cc5b55490ed
--- /dev/null
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Create.json
@@ -0,0 +1,26 @@
+{
+  "parameters": {
+    "subscriptionId": "subscriptionId",
+    "resourceGroup": "resourceGroup",
+    "accountName": "accountName",
+    "poolName": "poolName",
+    "volumeName": "volumeName",
+    "snapshotName": "snapshotName",
+    "api-version": "2017-08-15",
+    "body": {}
+  },
+  "responses": {
+    "201": {
+      "body": {
+        "location": "eastus",
+        "properties": {
+          "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333",
+          "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
+          "creationDate": "2017-08-15T13:23:33Z",
+          "provisioningState": "Created"
+        }
+      }
+    },
+    "202": {}
+  }
+}
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json
index 5c660d874a8a..1869ef8f13de 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Get.json
@@ -16,7 +16,6 @@
           "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333",
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
           "creationDate": "2017-08-15T13:23:33Z",
-          "name": "snapshot1",
           "provisioningState": "Created"
         }
       }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json
index e71030ad44c2..61fc3f1f5ec0 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_List.json
@@ -17,7 +17,6 @@
               "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333",
               "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
               "creationDate": "2017-08-15T13:23:33Z",
-              "name": "snapshot1",
               "provisioningState": "Created"
             }
           }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json
similarity index 54%
rename from specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json
rename to specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json
index daed397cc47c..cfbb9f2dbff0 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/MountTargets_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Snapshots_Update.json
@@ -5,23 +5,18 @@
     "accountName": "accountName",
     "poolName": "poolName",
     "volumeName": "volumeName",
-    "mountTargetName": "mountTargetName",
-    "api-version": "2017-08-15"
+    "snapshotName": "snapshotName",
+    "api-version": "2017-08-15",
+    "body": {}
   },
   "responses": {
     "200": {
       "body": {
         "location": "eastus",
         "properties": {
-          "endIp": "1.2.3.4",
-          "mountTargetId": "9760acf5-4638-11e7-9bdb-020073ca3333",
-          "name": "mountTarget1",
-          "startIp": "1.2.3.4",
+          "snapshotId": "9760acf5-4638-11e7-9bdb-020073ca3333",
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca3333",
-          "vlanId": 1337,
-          "netmask": "255.255.255.0",
-          "ipAddress": "1.2.3.4",
-          "gateway": "1.2.3.4",
+          "creationDate": "2017-08-15T13:23:33Z",
           "provisioningState": "Created"
         }
       }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json
index fd4a9a31e044..9caac72ce596 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_CreateOrUpdate.json
@@ -14,12 +14,24 @@
         "location": "eastus",
         "properties": {
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
-          "name": "myvolume",
           "creationToken": "some-amazing-filepath",
-          "usageThreshold": 101010,
+          "usageThreshold": 107374182400,
           "serviceLevel": "Premium",
           "provisioningState": "Created",
-          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+        }
+      }
+    },
+    "201": {
+      "body": {
+        "location": "eastus",
+        "properties": {
+          "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
+          "creationToken": "some-amazing-filepath",
+          "usageThreshold": 107374182400,
+          "serviceLevel": "Premium",
+          "provisioningState": "Created",
+          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
         }
       }
     },
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json
index db4770e998c4..67bd0e2abbd3 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Get.json
@@ -13,12 +13,11 @@
         "location": "eastus",
         "properties": {
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
-          "name": "myvolume",
           "creationToken": "some-amazing-filepath",
-          "usageThreshold": 101010,
+          "usageThreshold": 107374182400,
           "serviceLevel": "Premium",
           "provisioningState": "Created",
-          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+          "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
         }
       }
     }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json
index 73b7c041619e..152c8d088946 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_List.json
@@ -14,12 +14,11 @@
             "location": "eastus",
             "properties": {
               "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
-              "name": "myvolume",
               "creationToken": "some-amazing-filepath",
-              "usageThreshold": 101010,
+              "usageThreshold": 107374182400,
               "serviceLevel": "Premium",
               "provisioningState": "Created",
-              "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroup/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
+              "subnetId": "/subscriptions/9760acf5-4638-11e7-9bdb-020073ca7778/resourceGroups/myRP/providers/Microsoft.Network/virtualNetworks/testvnet3/subnets/testsubnet3"
             }
           }
         ]
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json
index 43e41f274568..98002937dd14 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/examples/Volumes_Update.json
@@ -14,9 +14,8 @@
         "location": "eastus",
         "properties": {
           "fileSystemId": "9760acf5-4638-11e7-9bdb-020073ca7778",
-          "name": "myvolume",
           "creationToken": "some-amazing-filepath",
-          "usageThreshold": 101010,
+          "usageThreshold": 107374182400,
           "serviceLevel": "Premium",
           "provisioningState": "Created"
         }
diff --git a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json
index 103a2b754cf7..211777618569 100644
--- a/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json
+++ b/specification/netapp/resource-manager/Microsoft.NetApp/preview/2017-08-15/netapp.json
@@ -49,6 +49,9 @@
             "$ref": "#/parameters/ApiVersionParameter"
           }
         ],
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -65,7 +68,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -83,6 +86,9 @@
           "NetApp Accounts"
         ],
         "operationId": "Accounts_List",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -104,7 +110,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -163,7 +169,7 @@
           }
         ],
         "responses": {
-          "200": {
+          "201": {
             "description": "Account created",
             "schema": {
               "$ref": "#/definitions/netAppAccount"
@@ -251,7 +257,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -272,6 +278,9 @@
           "Capacity Pools"
         ],
         "operationId": "Pools_List",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -293,7 +302,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroup/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -356,7 +365,13 @@
         ],
         "responses": {
           "200": {
-            "description": "Pool created or updated",
+            "description": "OK - pool updated",
+            "schema": {
+              "$ref": "#/definitions/capacityPool"
+            }
+          },
+          "201": {
+            "description": "Pool created",
             "schema": {
               "$ref": "#/definitions/capacityPool"
             }
@@ -443,7 +458,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -467,6 +482,9 @@
           "Volumes"
         ],
         "operationId": "Volumes_List",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -488,7 +506,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -554,7 +572,13 @@
         ],
         "responses": {
           "200": {
-            "description": "Volume created or updated",
+            "description": "Ok - volume updated",
+            "schema": {
+              "$ref": "#/definitions/volume"
+            }
+          },
+          "201": {
+            "description": "Volume created",
             "schema": {
               "$ref": "#/definitions/volume"
             }
@@ -641,7 +665,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/mountTargets": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/mountTargets": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -668,6 +692,9 @@
         ],
         "operationId": "MountTargets_List",
         "description": "List mount targets",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
@@ -689,7 +716,7 @@
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/mountTargets/{mountTargetName}": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -706,51 +733,25 @@
         {
           "$ref": "#/parameters/VolumeName"
         },
-        {
-          "$ref": "#/parameters/MountTargetName"
-        },
         {
           "$ref": "#/parameters/ApiVersionParameter"
         }
       ],
       "get": {
         "tags": [
-          "MountTargets"
+          "Snapshots"
         ],
-        "operationId": "MountTargets_Get",
-        "description": "Get a mount target",
+        "operationId": "Snapshots_List",
+        "description": "List snapshots",
+        "x-ms-pageable": {
+          "nextLinkName": null
+        },
         "responses": {
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/mountTarget"
-            }
-          },
-          "default": {
-            "description": "Error response describing why the operation failed.",
-            "schema": {
-              "$ref": "#/definitions/error"
+              "$ref": "#/definitions/snapshotsList"
             }
-          }
-        },
-        "x-ms-examples": {
-          "MountTargets_Get": {
-            "$ref": "examples/MountTargets_Get.json"
-          }
-        }
-      },
-      "delete": {
-        "tags": [
-          "MountTargets"
-        ],
-        "operationId": "MountTargets_Delete",
-        "description": "Delete mount target",
-        "responses": {
-          "202": {
-            "description": "Accepted -- Create or update request accepted; operation will complete asynchronously"
-          },
-          "204": {
-            "description": "NoContent -- Resource does not exist."
           },
           "default": {
             "description": "Error response describing why the operation failed.",
@@ -759,15 +760,14 @@
             }
           }
         },
-        "x-ms-long-running-operation": true,
         "x-ms-examples": {
-          "MountTargets_Delete": {
-            "$ref": "examples/MountTargets_Delete.json"
+          "Snapshots_List": {
+            "$ref": "examples/Snapshots_List.json"
           }
         }
       }
     },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/snapshots": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/capacityPools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}": {
       "parameters": [
         {
           "$ref": "#/parameters/SubscriptionId"
@@ -784,6 +784,9 @@
         {
           "$ref": "#/parameters/VolumeName"
         },
+        {
+          "$ref": "#/parameters/SnapshotName"
+        },
         {
           "$ref": "#/parameters/ApiVersionParameter"
         }
@@ -792,13 +795,13 @@
         "tags": [
           "Snapshots"
         ],
-        "operationId": "Snapshots_List",
-        "description": "List snapshots",
+        "operationId": "Snapshots_Get",
+        "description": "Get a snapshot",
         "responses": {
           "200": {
             "description": "OK",
             "schema": {
-              "$ref": "#/definitions/snapshotsList"
+              "$ref": "#/definitions/snapshot"
             }
           },
           "default": {
@@ -809,42 +812,69 @@
           }
         },
         "x-ms-examples": {
-          "Snapshots_List": {
-            "$ref": "examples/Snapshots_List.json"
+          "Snapshots_Get": {
+            "$ref": "examples/Snapshots_Get.json"
           }
         }
-      }
-    },
-    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.NetApp/netAppAccounts/{accountName}/pools/{poolName}/volumes/{volumeName}/snapshots/{snapshotName}": {
-      "parameters": [
-        {
-          "$ref": "#/parameters/SubscriptionId"
-        },
-        {
-          "$ref": "#/parameters/ResourceGroup"
-        },
-        {
-          "$ref": "#/parameters/AccountName"
-        },
-        {
-          "$ref": "#/parameters/PoolName"
-        },
-        {
-          "$ref": "#/parameters/VolumeName"
-        },
-        {
-          "$ref": "#/parameters/SnapshotName"
+      },
+      "put": {
+        "tags": [
+          "Snapshots"
+        ],
+        "operationId": "Snapshots_Create",
+        "description": "Create a snapshot",
+        "parameters": [
+          {
+            "name": "body",
+            "description": "Snapshot object supplied in the body of the operation.",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/snapshot"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": "Snapshot created",
+            "schema": {
+              "$ref": "#/definitions/snapshot"
+            }
+          },
+          "202": {
+            "description": "Accepted -- Create request accepted; operation will complete asynchronously"
+          },
+          "default": {
+            "description": "Error response describing why the operation failed.",
+            "schema": {
+              "$ref": "#/definitions/error"
+            }
+          }
         },
-        {
-          "$ref": "#/parameters/ApiVersionParameter"
+        "x-ms-long-running-operation": true,
+        "x-ms-examples": {
+          "Snapshots_Create": {
+            "$ref": "examples/Snapshots_Create.json"
+          }
         }
-      ],
-      "get": {
+      },
+      "patch": {
         "tags": [
           "Snapshots"
         ],
-        "operationId": "Snapshots_Get",
-        "description": "Get a snapshot",
+        "operationId": "Snapshots_Update",
+        "description": "Patch a snapshot",
+        "parameters": [
+          {
+            "name": "body",
+            "description": "Snapshot object supplied in the body of the operation.",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/snapshotPatch"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "OK",
@@ -860,8 +890,8 @@
           }
         },
         "x-ms-examples": {
-          "Snapshots_Get": {
-            "$ref": "examples/Snapshots_Get.json"
+          "Snapshots_Update": {
+            "$ref": "examples/Snapshots_Update.json"
           }
         }
       },
@@ -1096,16 +1126,6 @@
       "description": "NetApp account properties",
       "type": "object",
       "properties": {
-        "accountId": {
-          "title": "accountId",
-          "type": "string",
-          "readOnly": true,
-          "description": "UUID v4 used to identify the Account",
-          "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-          "maxLength": 36,
-          "minLength": 36,
-          "example": "9760acf5-4638-11e7-9bdb-020073ca7778"
-        },
         "provisioningState": {
           "type": "string",
           "readOnly": true,
@@ -1183,19 +1203,7 @@
     "poolProperties": {
       "description": "Pool properties",
       "type": "object",
-      "required": [
-        "accountId"
-      ],
       "properties": {
-        "accountId": {
-          "title": "accountId",
-          "type": "string",
-          "description": "UUID v4 used to identify the Account",
-          "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$",
-          "maxLength": 36,
-          "minLength": 36,
-          "example": "9760acf5-4638-11e7-9bdb-020073ca7778"
-        },
         "poolId": {
           "title": "poolId",
           "type": "string",
@@ -1209,27 +1217,25 @@
         "size": {
           "title": "size",
           "type": "integer",
-          "description": "Provisioned size of the pool (in GB)",
-          "minimum": 4096,
-          "default": 4096
+          "format": "int64",
+          "description": "Provisioned size of the pool (in bytes). Allowed values are in 4TiB chunks (value must be multiply of 4398046511104).",
+          "minimum": 4398046511104,
+          "maximum": 549755813888000,
+          "default": 4398046511104
         },
         "serviceLevel": {
           "title": "serviceLevel",
           "type": "string",
           "description": "The service level of the file system",
           "enum": [
-            "Basic",
             "Standard",
-            "Premium"
+            "Premium",
+            "Extreme"
           ],
           "x-ms-enum": {
             "name": "ServiceLevel",
             "modelAsString": true,
             "values": [
-              {
-                "value": "Basic",
-                "description": "Basic service level"
-              },
               {
                 "value": "Standard",
                 "description": "Standard service level"
@@ -1237,11 +1243,15 @@
               {
                 "value": "Premium",
                 "description": "Premium service level"
+              },
+              {
+                "value": "Extreme",
+                "description": "Extreme service level"
               }
             ]
           },
-          "example": "Premium",
-          "default": "Standard"
+          "example": "Extreme",
+          "default": "Premium"
         },
         "provisioningState": {
           "type": "string",
@@ -1328,12 +1338,6 @@
           "minLength": 36,
           "example": "9760acf5-4638-11e7-9bdb-020073ca7778"
         },
-        "name": {
-          "title": "FileSystem name",
-          "type": "string",
-          "description": "FileSystem name",
-          "example": "myvolume"
-        },
         "creationToken": {
           "title": "Creation Token or File Path",
           "type": "string",
@@ -1347,18 +1351,14 @@
           "type": "string",
           "description": "The service level of the file system",
           "enum": [
-            "Basic",
             "Standard",
-            "Premium"
+            "Premium",
+            "Extreme"
           ],
           "x-ms-enum": {
             "name": "ServiceLevel",
             "modelAsString": true,
             "values": [
-              {
-                "value": "Basic",
-                "description": "Basic service level"
-              },
               {
                 "value": "Standard",
                 "description": "Standard service level"
@@ -1366,21 +1366,25 @@
               {
                 "value": "Premium",
                 "description": "Premium service level"
+              },
+              {
+                "value": "Extreme",
+                "description": "Extreme service level"
               }
             ]
           },
-          "example": "Premium",
-          "default": "Standard"
+          "example": "Extreme",
+          "default": "Premium"
         },
         "usageThreshold": {
           "title": "usageThreshold",
           "type": "integer",
           "format": "int64",
-          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Upper limit is 100TB.",
-          "minimum": 0,
+          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.",
+          "minimum": 107374182400,
           "maximum": 109951162777600,
-          "default": 0,
-          "example": 101010
+          "default": 107374182400,
+          "example": 107374182400
         },
         "provisioningState": {
           "type": "string",
@@ -1432,29 +1436,19 @@
       "description": "Patchable volume properties",
       "type": "object",
       "properties": {
-        "name": {
-          "title": "FileSystem name",
-          "type": "string",
-          "description": "FileSystem name",
-          "example": "myvolume"
-        },
         "serviceLevel": {
           "title": "serviceLevel",
           "type": "string",
           "description": "The service level of the file system",
           "enum": [
-            "Basic",
             "Standard",
-            "Premium"
+            "Premium",
+            "Extreme"
           ],
           "x-ms-enum": {
             "name": "ServiceLevel",
             "modelAsString": true,
             "values": [
-              {
-                "value": "Basic",
-                "description": "Basic service level"
-              },
               {
                 "value": "Standard",
                 "description": "Standard service level"
@@ -1462,21 +1456,25 @@
               {
                 "value": "Premium",
                 "description": "Premium service level"
+              },
+              {
+                "value": "Extreme",
+                "description": "Extreme service level"
               }
             ]
           },
-          "example": "Premium",
-          "default": "Standard"
+          "example": "Extreme",
+          "default": "Premium"
         },
         "usageThreshold": {
           "title": "usageThreshold",
           "type": "integer",
           "format": "int64",
-          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Upper limit is 100TB.",
-          "minimum": 0,
+          "description": "Maximum storage quota allowed for a file system in bytes. This is a soft quota used for alerting only. Minimum size is 100 GiB. Upper limit is 100TiB.",
+          "minimum": 107374182400,
           "maximum": 109951162777600,
-          "default": 0,
-          "example": 101010
+          "default": 107374182400,
+          "example": 107374182400
         }
       }
     },
@@ -1560,13 +1558,6 @@
           "readOnly": true,
           "example": "1.2.3.4"
         },
-        "name": {
-          "title": "name",
-          "type": "string",
-          "readOnly": true,
-          "description": "The name of the mount target",
-          "example": "mountTarget1"
-        },
         "vlanId": {
           "title": "vlanid",
           "type": "integer",
@@ -1620,6 +1611,7 @@
     "snapshot": {
       "description": "Snapshot of a Volume",
       "type": "object",
+      "x-ms-azure-resource": true,
       "required": [
         "location",
         "properties"
@@ -1627,7 +1619,11 @@
       "properties": {
         "location": {
           "type": "string",
-          "description": "Resource location"
+          "description": "Resource location",
+          "x-ms-mutability": [
+            "read",
+            "create"
+          ]
         },
         "id": {
           "type": "string",
@@ -1639,6 +1635,11 @@
           "readOnly": true,
           "description": "Resource name"
         },
+        "type": {
+          "type": "string",
+          "readOnly": true,
+          "description": "Resource type"
+        },
         "tags": {
           "description": "Resource tags",
           "$ref": "#/definitions/resourceTags",
@@ -1651,6 +1652,18 @@
         }
       }
     },
+    "snapshotPatch": {
+      "description": "Snapshot patch",
+      "type": "object",
+      "x-ms-azure-resource": true,
+      "properties": {
+        "tags": {
+          "description": "Resource tags",
+          "$ref": "#/definitions/resourceTags",
+          "x-ms-client-flatten": true
+        }
+      }
+    },
     "snapshotProperties": {
       "description": "Snapshot properties",
       "type": "object",
@@ -1677,13 +1690,6 @@
           "minLength": 36,
           "example": "9760acf5-4638-11e7-9bdb-020073ca3333"
         },
-        "name": {
-          "title": "name",
-          "type": "string",
-          "readOnly": true,
-          "description": "The name of the snapshot",
-          "example": "snapshot1"
-        },
         "creationDate": {
           "title": "name",
           "type": "string",