diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ISKUsOperations.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ISkusOperations.cs
similarity index 100%
rename from sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ISKUsOperations.cs
rename to sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ISkusOperations.cs
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionService.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionService.cs
index 2ad3e28c28df..6144adee6030 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionService.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionService.cs
@@ -36,10 +36,16 @@ public EncryptionService()
         /// returned when encryption is enabled. There might be some
         /// unencrypted blobs which were written after this time, as it is just
         /// a rough estimate.</param>
-        public EncryptionService(bool? enabled = default(bool?), System.DateTime? lastEnabledTime = default(System.DateTime?))
+        /// <param name="keyType">Encryption key type to be used for the
+        /// encryption service. 'Account' key type implies that an
+        /// account-scoped encryption key will be used. 'Service' key type
+        /// implies that a default service key is used. Possible values
+        /// include: 'Service', 'Account'</param>
+        public EncryptionService(bool? enabled = default(bool?), System.DateTime? lastEnabledTime = default(System.DateTime?), string keyType = default(string))
         {
             Enabled = enabled;
             LastEnabledTime = lastEnabledTime;
+            KeyType = keyType;
             CustomInit();
         }
 
@@ -64,5 +70,15 @@ public EncryptionService()
         [JsonProperty(PropertyName = "lastEnabledTime")]
         public System.DateTime? LastEnabledTime { get; private set; }
 
+        /// <summary>
+        /// Gets or sets encryption key type to be used for the encryption
+        /// service. 'Account' key type implies that an account-scoped
+        /// encryption key will be used. 'Service' key type implies that a
+        /// default service key is used. Possible values include: 'Service',
+        /// 'Account'
+        /// </summary>
+        [JsonProperty(PropertyName = "keyType")]
+        public string KeyType { get; set; }
+
     }
 }
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionServices.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionServices.cs
index e4be12f6f978..fd7586a27f9e 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionServices.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/EncryptionServices.cs
@@ -64,16 +64,16 @@ public EncryptionServices()
         public EncryptionService File { get; set; }
 
         /// <summary>
-        /// Gets the encryption function of the table storage service.
+        /// Gets or sets the encryption function of the table storage service.
         /// </summary>
         [JsonProperty(PropertyName = "table")]
-        public EncryptionService Table { get; private set; }
+        public EncryptionService Table { get; set; }
 
         /// <summary>
-        /// Gets the encryption function of the queue storage service.
+        /// Gets or sets the encryption function of the queue storage service.
         /// </summary>
         [JsonProperty(PropertyName = "queue")]
-        public EncryptionService Queue { get; private set; }
+        public EncryptionService Queue { get; set; }
 
     }
 }
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/IpRule.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/IPRule.cs
similarity index 100%
rename from sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/IpRule.cs
rename to sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/IPRule.cs
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/KeyType.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/KeyType.cs
new file mode 100644
index 000000000000..0ae2853331b9
--- /dev/null
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/KeyType.cs
@@ -0,0 +1,22 @@
+// <auto-generated>
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for
+// license information.
+//
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.Azure.Management.Storage.Models
+{
+
+    /// <summary>
+    /// Defines values for KeyType.
+    /// </summary>
+    public static class KeyType
+    {
+        public const string Service = "Service";
+        public const string Account = "Account";
+    }
+}
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/signedResource.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/SignedResource.cs
similarity index 100%
rename from sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/signedResource.cs
rename to sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/SignedResource.cs
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SdkInfo_StorageManagementClient.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SdkInfo_StorageManagementClient.cs
index 48b57c1bea08..2742c80e5fdd 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SdkInfo_StorageManagementClient.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SdkInfo_StorageManagementClient.cs
@@ -33,16 +33,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_StorageManageme
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "latest";
-      public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4407";
-      public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/storage/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --csharp.output-folder=C:\\code\\srpsdk\\sdk\\storage\\Microsoft.Azure.Management.Storage\\src\\Generated";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "0cf70260108cb40bc68d408674c187ed065f8c64";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SKUsOperations.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SkusOperations.cs
similarity index 100%
rename from sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SKUsOperations.cs
rename to sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SkusOperations.cs
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SKUsOperationsExtensions.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SkusOperationsExtensions.cs
similarity index 100%
rename from sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SKUsOperationsExtensions.cs
rename to sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/SkusOperationsExtensions.cs