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/BlobServiceProperties.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobServiceProperties.cs
index c642b11befea..7fe604f54556 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobServiceProperties.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/BlobServiceProperties.cs
@@ -57,8 +57,10 @@ public BlobServiceProperties()
         /// feed events.</param>
         /// <param name="restorePolicy">The blob service properties for blob
         /// restore policy.</param>
+        /// <param name="containerDeleteRetentionPolicy">The blob service
+        /// properties for container soft delete.</param>
         /// <param name="sku">Sku name and tier.</param>
-        public BlobServiceProperties(string id = default(string), string name = default(string), string type = default(string), CorsRules cors = default(CorsRules), string defaultServiceVersion = default(string), DeleteRetentionPolicy deleteRetentionPolicy = default(DeleteRetentionPolicy), bool? isVersioningEnabled = default(bool?), bool? automaticSnapshotPolicyEnabled = default(bool?), ChangeFeed changeFeed = default(ChangeFeed), RestorePolicyProperties restorePolicy = default(RestorePolicyProperties), Sku sku = default(Sku))
+        public BlobServiceProperties(string id = default(string), string name = default(string), string type = default(string), CorsRules cors = default(CorsRules), string defaultServiceVersion = default(string), DeleteRetentionPolicy deleteRetentionPolicy = default(DeleteRetentionPolicy), bool? isVersioningEnabled = default(bool?), bool? automaticSnapshotPolicyEnabled = default(bool?), ChangeFeed changeFeed = default(ChangeFeed), RestorePolicyProperties restorePolicy = default(RestorePolicyProperties), DeleteRetentionPolicy containerDeleteRetentionPolicy = default(DeleteRetentionPolicy), Sku sku = default(Sku))
             : base(id, name, type)
         {
             Cors = cors;
@@ -68,6 +70,7 @@ public BlobServiceProperties()
             AutomaticSnapshotPolicyEnabled = automaticSnapshotPolicyEnabled;
             ChangeFeed = changeFeed;
             RestorePolicy = restorePolicy;
+            ContainerDeleteRetentionPolicy = containerDeleteRetentionPolicy;
             Sku = sku;
             CustomInit();
         }
@@ -125,6 +128,12 @@ public BlobServiceProperties()
         [JsonProperty(PropertyName = "properties.restorePolicy")]
         public RestorePolicyProperties RestorePolicy { get; set; }
 
+        /// <summary>
+        /// Gets or sets the blob service properties for container soft delete.
+        /// </summary>
+        [JsonProperty(PropertyName = "properties.containerDeleteRetentionPolicy")]
+        public DeleteRetentionPolicy ContainerDeleteRetentionPolicy { get; set; }
+
         /// <summary>
         /// Gets sku name and tier.
         /// </summary>
@@ -147,6 +156,10 @@ public virtual void Validate()
             {
                 RestorePolicy.Validate();
             }
+            if (ContainerDeleteRetentionPolicy != null)
+            {
+                ContainerDeleteRetentionPolicy.Validate();
+            }
             if (Sku != null)
             {
                 Sku.Validate();
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/KeyVaultProperties.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/KeyVaultProperties.cs
index 47b525ee3daf..13a2cee5efaf 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/KeyVaultProperties.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/KeyVaultProperties.cs
@@ -32,11 +32,17 @@ public KeyVaultProperties()
         /// <param name="keyName">The name of KeyVault key.</param>
         /// <param name="keyVersion">The version of KeyVault key.</param>
         /// <param name="keyVaultUri">The Uri of KeyVault.</param>
-        public KeyVaultProperties(string keyName = default(string), string keyVersion = default(string), string keyVaultUri = default(string))
+        /// <param name="currentVersionedKeyIdentifier">The object identifier
+        /// of the current versioned Key Vault Key in use.</param>
+        /// <param name="lastKeyRotationTimestamp">Timestamp of last rotation
+        /// of the Key Vault Key.</param>
+        public KeyVaultProperties(string keyName = default(string), string keyVersion = default(string), string keyVaultUri = default(string), string currentVersionedKeyIdentifier = default(string), System.DateTime? lastKeyRotationTimestamp = default(System.DateTime?))
         {
             KeyName = keyName;
             KeyVersion = keyVersion;
             KeyVaultUri = keyVaultUri;
+            CurrentVersionedKeyIdentifier = currentVersionedKeyIdentifier;
+            LastKeyRotationTimestamp = lastKeyRotationTimestamp;
             CustomInit();
         }
 
@@ -63,5 +69,18 @@ public KeyVaultProperties()
         [JsonProperty(PropertyName = "keyvaulturi")]
         public string KeyVaultUri { get; set; }
 
+        /// <summary>
+        /// Gets the object identifier of the current versioned Key Vault Key
+        /// in use.
+        /// </summary>
+        [JsonProperty(PropertyName = "currentVersionedKeyIdentifier")]
+        public string CurrentVersionedKeyIdentifier { get; private set; }
+
+        /// <summary>
+        /// Gets timestamp of last rotation of the Key Vault Key.
+        /// </summary>
+        [JsonProperty(PropertyName = "lastKeyRotationTimestamp")]
+        public System.DateTime? LastKeyRotationTimestamp { get; private set; }
+
     }
 }
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 a61c88fe33ab..d7e4d5f18c77 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
@@ -34,16 +34,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.4413";
-      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 = "2df17398750388e7a8e51eeedaac8bfe099e612b";
-      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