diff --git a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
index d52ce199c949..67bcd8d2ad0a 100644
--- a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
+++ b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-02-02/blob.json
@@ -2039,7 +2039,9 @@
                 "enum": [
                   "Storage",
                   "BlobStorage",
-                  "StorageV2"
+                  "StorageV2",
+                  "FileStorage",
+                  "BlockBlobStorage"
                 ],
                 "x-ms-enum": {
                   "name": "AccountKind",
@@ -5937,7 +5939,9 @@
                 "enum": [
                   "Storage",
                   "BlobStorage",
-                  "StorageV2"
+                  "StorageV2",
+                  "FileStorage",
+                  "BlockBlobStorage"
                 ],
                 "x-ms-enum": {
                   "name": "AccountKind",
diff --git a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-07-07/blob.json b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-07-07/blob.json
index a96a454079b9..aec171b0f857 100644
--- a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-07-07/blob.json
+++ b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-07-07/blob.json
@@ -2055,7 +2055,9 @@
                 "enum": [
                   "Storage",
                   "BlobStorage",
-                  "StorageV2"
+                  "StorageV2",
+                  "FileStorage",
+                  "BlockBlobStorage"
                 ],
                 "x-ms-enum": {
                   "name": "AccountKind",
@@ -6003,7 +6005,9 @@
                 "enum": [
                   "Storage",
                   "BlobStorage",
-                  "StorageV2"
+                  "StorageV2",
+                  "FileStorage",
+                  "BlockBlobStorage"
                 ],
                 "x-ms-enum": {
                   "name": "AccountKind",
diff --git a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-12-12/blob.json b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-12-12/blob.json
index aaf18e861737..1ef33bcd423e 100644
--- a/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-12-12/blob.json
+++ b/specification/storage/data-plane/Microsoft.BlobStorage/preview/2019-12-12/blob.json
@@ -2222,7 +2222,9 @@
                 "enum": [
                   "Storage",
                   "BlobStorage",
-                  "StorageV2"
+                  "StorageV2",
+                  "FileStorage",
+                  "BlockBlobStorage"
                 ],
                 "x-ms-enum": {
                   "name": "AccountKind",
@@ -6470,7 +6472,9 @@
                 "enum": [
                   "Storage",
                   "BlobStorage",
-                  "StorageV2"
+                  "StorageV2",
+                  "FileStorage",
+                  "BlockBlobStorage"
                 ],
                 "x-ms-enum": {
                   "name": "AccountKind",
@@ -10595,7 +10599,7 @@
       ],
       "x-ms-enum": {
         "name": "RehydratePriority",
-        "modelAsString": false
+        "modelAsString": true
       },
       "xml": {
         "name": "RehydratePriority"