diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IObjectReplicationPoliciesOperations.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IObjectReplicationPoliciesOperations.cs
index a1992ad255e75..541469de4f470 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IObjectReplicationPoliciesOperations.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/IObjectReplicationPoliciesOperations.cs
@@ -66,8 +66,11 @@ public partial interface IObjectReplicationPoliciesOperations
         /// length and use numbers and lower-case letters only.
         /// </param>
         /// <param name='objectReplicationPolicyId'>
-        /// The ID of object replication policy or 'default' if the policy ID
-        /// is unknown.
+        /// For the destination account, provide the value 'default'. Configure
+        /// the policy on the destination account first. For the source
+        /// account, provide the value of the policy ID that is returned when
+        /// you download the policy that was defined on the destination
+        /// account. The policy is downloaded as a JSON file.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
@@ -99,8 +102,11 @@ public partial interface IObjectReplicationPoliciesOperations
         /// length and use numbers and lower-case letters only.
         /// </param>
         /// <param name='objectReplicationPolicyId'>
-        /// The ID of object replication policy or 'default' if the policy ID
-        /// is unknown.
+        /// For the destination account, provide the value 'default'. Configure
+        /// the policy on the destination account first. For the source
+        /// account, provide the value of the policy ID that is returned when
+        /// you download the policy that was defined on the destination
+        /// account. The policy is downloaded as a JSON file.
         /// </param>
         /// <param name='properties'>
         /// The object replication policy set to a storage account. A unique
@@ -136,8 +142,11 @@ public partial interface IObjectReplicationPoliciesOperations
         /// length and use numbers and lower-case letters only.
         /// </param>
         /// <param name='objectReplicationPolicyId'>
-        /// The ID of object replication policy or 'default' if the policy ID
-        /// is unknown.
+        /// For the destination account, provide the value 'default'. Configure
+        /// the policy on the destination account first. For the source
+        /// account, provide the value of the policy ID that is returned when
+        /// you download the policy that was defined on the destination
+        /// account. The policy is downloaded as a JSON file.
         /// </param>
         /// <param name='customHeaders'>
         /// The headers that will be added to request.
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/AccessPolicy.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/AccessPolicy.cs
index 46c6bc18d6663..24fcaec443f25 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/AccessPolicy.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/AccessPolicy.cs
@@ -26,13 +26,13 @@ public AccessPolicy()
         /// <summary>
         /// Initializes a new instance of the AccessPolicy class.
         /// </summary>
-        /// <param name="start">Start time of the access policy</param>
-        /// <param name="expiry">Expiry time of the access policy</param>
+        /// <param name="startTime">Start time of the access policy</param>
+        /// <param name="expiryTime">Expiry time of the access policy</param>
         /// <param name="permission">List of abbreviated permissions.</param>
-        public AccessPolicy(System.DateTime? start = default(System.DateTime?), System.DateTime? expiry = default(System.DateTime?), string permission = default(string))
+        public AccessPolicy(System.DateTime? startTime = default(System.DateTime?), System.DateTime? expiryTime = default(System.DateTime?), string permission = default(string))
         {
-            Start = start;
-            Expiry = expiry;
+            StartTime = startTime;
+            ExpiryTime = expiryTime;
             Permission = permission;
             CustomInit();
         }
@@ -45,14 +45,14 @@ public AccessPolicy()
         /// <summary>
         /// Gets or sets start time of the access policy
         /// </summary>
-        [JsonProperty(PropertyName = "start")]
-        public System.DateTime? Start { get; set; }
+        [JsonProperty(PropertyName = "startTime")]
+        public System.DateTime? StartTime { get; set; }
 
         /// <summary>
         /// Gets or sets expiry time of the access policy
         /// </summary>
-        [JsonProperty(PropertyName = "expiry")]
-        public System.DateTime? Expiry { get; set; }
+        [JsonProperty(PropertyName = "expiryTime")]
+        public System.DateTime? ExpiryTime { get; set; }
 
         /// <summary>
         /// Gets or sets list of abbreviated permissions.
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ChangeFeed.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ChangeFeed.cs
index 0c6b719765ee2..2368b152208f1 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ChangeFeed.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/ChangeFeed.cs
@@ -72,16 +72,13 @@ public ChangeFeed()
         /// </exception>
         public virtual void Validate()
         {
-            if (RetentionInDays != null)
+            if (RetentionInDays > 146000)
             {
-                if (RetentionInDays > 146000)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMaximum, "RetentionInDays", 146000);
-                }
-                if (RetentionInDays < 1)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "RetentionInDays", 1);
-                }
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "RetentionInDays", 146000);
+            }
+            if (RetentionInDays < 1)
+            {
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "RetentionInDays", 1);
             }
         }
     }
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DateAfterModification.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DateAfterModification.cs
index 2a6bdd42c43c0..0948ac5c79c30 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DateAfterModification.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DateAfterModification.cs
@@ -72,27 +72,21 @@ public DateAfterModification()
         /// </exception>
         public virtual void Validate()
         {
-            if (DaysAfterModificationGreaterThan != null)
+            if (DaysAfterModificationGreaterThan < 0)
             {
-                if (DaysAfterModificationGreaterThan < 0)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "DaysAfterModificationGreaterThan", 0);
-                }
-                if (DaysAfterModificationGreaterThan % 1 != 0)
-                {
-                    throw new ValidationException(ValidationRules.MultipleOf, "DaysAfterModificationGreaterThan", 1);
-                }
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "DaysAfterModificationGreaterThan", 0);
             }
-            if (DaysAfterLastAccessTimeGreaterThan != null)
+            if (DaysAfterModificationGreaterThan % 1 != 0)
             {
-                if (DaysAfterLastAccessTimeGreaterThan < 0)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "DaysAfterLastAccessTimeGreaterThan", 0);
-                }
-                if (DaysAfterLastAccessTimeGreaterThan % 1 != 0)
-                {
-                    throw new ValidationException(ValidationRules.MultipleOf, "DaysAfterLastAccessTimeGreaterThan", 1);
-                }
+                throw new ValidationException(ValidationRules.MultipleOf, "DaysAfterModificationGreaterThan", 1);
+            }
+            if (DaysAfterLastAccessTimeGreaterThan < 0)
+            {
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "DaysAfterLastAccessTimeGreaterThan", 0);
+            }
+            if (DaysAfterLastAccessTimeGreaterThan % 1 != 0)
+            {
+                throw new ValidationException(ValidationRules.MultipleOf, "DaysAfterLastAccessTimeGreaterThan", 1);
             }
         }
     }
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DeleteRetentionPolicy.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DeleteRetentionPolicy.cs
index 26e5d6dc82084..b5f1c7ccb8c42 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DeleteRetentionPolicy.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/DeleteRetentionPolicy.cs
@@ -69,16 +69,13 @@ public DeleteRetentionPolicy()
         /// </exception>
         public virtual void Validate()
         {
-            if (Days != null)
+            if (Days > 365)
             {
-                if (Days > 365)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMaximum, "Days", 365);
-                }
-                if (Days < 1)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "Days", 1);
-                }
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "Days", 365);
+            }
+            if (Days < 1)
+            {
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "Days", 1);
             }
         }
     }
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShare.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShare.cs
index e62683bc92eb7..18f51af3a8a1b 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShare.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShare.cs
@@ -248,16 +248,13 @@ public FileShare()
         /// </exception>
         public virtual void Validate()
         {
-            if (ShareQuota != null)
+            if (ShareQuota > 102400)
             {
-                if (ShareQuota > 102400)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMaximum, "ShareQuota", 102400);
-                }
-                if (ShareQuota < 1)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "ShareQuota", 1);
-                }
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "ShareQuota", 102400);
+            }
+            if (ShareQuota < 1)
+            {
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "ShareQuota", 1);
             }
         }
     }
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShareItem.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShareItem.cs
index da5a4d9bcbf2b..f0449e1da84ca 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShareItem.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/FileShareItem.cs
@@ -247,16 +247,13 @@ public FileShareItem()
         /// </exception>
         public virtual void Validate()
         {
-            if (ShareQuota != null)
+            if (ShareQuota > 102400)
             {
-                if (ShareQuota > 102400)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMaximum, "ShareQuota", 102400);
-                }
-                if (ShareQuota < 1)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "ShareQuota", 1);
-                }
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "ShareQuota", 102400);
+            }
+            if (ShareQuota < 1)
+            {
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "ShareQuota", 1);
             }
         }
     }
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/RestorePolicyProperties.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/RestorePolicyProperties.cs
index 8f6eef161321f..55a39da16715e 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/RestorePolicyProperties.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/Models/RestorePolicyProperties.cs
@@ -86,16 +86,13 @@ public RestorePolicyProperties()
         /// </exception>
         public virtual void Validate()
         {
-            if (Days != null)
+            if (Days > 365)
             {
-                if (Days > 365)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMaximum, "Days", 365);
-                }
-                if (Days < 1)
-                {
-                    throw new ValidationException(ValidationRules.InclusiveMinimum, "Days", 1);
-                }
+                throw new ValidationException(ValidationRules.InclusiveMaximum, "Days", 365);
+            }
+            if (Days < 1)
+            {
+                throw new ValidationException(ValidationRules.InclusiveMinimum, "Days", 1);
             }
         }
     }
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/ObjectReplicationPoliciesOperations.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperations.cs
index 78884e5c60ee9..4586876f4a93b 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperations.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperations.cs
@@ -297,8 +297,11 @@ internal ObjectReplicationPoliciesOperations(StorageManagementClient client)
         /// numbers and lower-case letters only.
         /// </param>
         /// <param name='objectReplicationPolicyId'>
-        /// The ID of object replication policy or 'default' if the policy ID is
-        /// unknown.
+        /// For the destination account, provide the value 'default'. Configure the
+        /// policy on the destination account first. For the source account, provide
+        /// the value of the policy ID that is returned when you download the policy
+        /// that was defined on the destination account. The policy is downloaded as a
+        /// JSON file.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
@@ -548,8 +551,11 @@ internal ObjectReplicationPoliciesOperations(StorageManagementClient client)
         /// numbers and lower-case letters only.
         /// </param>
         /// <param name='objectReplicationPolicyId'>
-        /// The ID of object replication policy or 'default' if the policy ID is
-        /// unknown.
+        /// For the destination account, provide the value 'default'. Configure the
+        /// policy on the destination account first. For the source account, provide
+        /// the value of the policy ID that is returned when you download the policy
+        /// that was defined on the destination account. The policy is downloaded as a
+        /// JSON file.
         /// </param>
         /// <param name='properties'>
         /// The object replication policy set to a storage account. A unique policy ID
@@ -819,8 +825,11 @@ internal ObjectReplicationPoliciesOperations(StorageManagementClient client)
         /// numbers and lower-case letters only.
         /// </param>
         /// <param name='objectReplicationPolicyId'>
-        /// The ID of object replication policy or 'default' if the policy ID is
-        /// unknown.
+        /// For the destination account, provide the value 'default'. Configure the
+        /// policy on the destination account first. For the source account, provide
+        /// the value of the policy ID that is returned when you download the policy
+        /// that was defined on the destination account. The policy is downloaded as a
+        /// JSON file.
         /// </param>
         /// <param name='customHeaders'>
         /// Headers that will be added to request.
diff --git a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperationsExtensions.cs b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperationsExtensions.cs
index 713ceb2b86d6e..84cba67aa18ef 100644
--- a/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperationsExtensions.cs
+++ b/sdk/storage/Microsoft.Azure.Management.Storage/src/Generated/ObjectReplicationPoliciesOperationsExtensions.cs
@@ -85,8 +85,11 @@ public static IEnumerable<ObjectReplicationPolicy> List(this IObjectReplicationP
             /// numbers and lower-case letters only.
             /// </param>
             /// <param name='objectReplicationPolicyId'>
-            /// The ID of object replication policy or 'default' if the policy ID is
-            /// unknown.
+            /// For the destination account, provide the value 'default'. Configure the
+            /// policy on the destination account first. For the source account, provide
+            /// the value of the policy ID that is returned when you download the policy
+            /// that was defined on the destination account. The policy is downloaded as a
+            /// JSON file.
             /// </param>
             public static ObjectReplicationPolicy Get(this IObjectReplicationPoliciesOperations operations, string resourceGroupName, string accountName, string objectReplicationPolicyId)
             {
@@ -109,8 +112,11 @@ public static ObjectReplicationPolicy Get(this IObjectReplicationPoliciesOperati
             /// numbers and lower-case letters only.
             /// </param>
             /// <param name='objectReplicationPolicyId'>
-            /// The ID of object replication policy or 'default' if the policy ID is
-            /// unknown.
+            /// For the destination account, provide the value 'default'. Configure the
+            /// policy on the destination account first. For the source account, provide
+            /// the value of the policy ID that is returned when you download the policy
+            /// that was defined on the destination account. The policy is downloaded as a
+            /// JSON file.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
@@ -139,8 +145,11 @@ public static ObjectReplicationPolicy Get(this IObjectReplicationPoliciesOperati
             /// numbers and lower-case letters only.
             /// </param>
             /// <param name='objectReplicationPolicyId'>
-            /// The ID of object replication policy or 'default' if the policy ID is
-            /// unknown.
+            /// For the destination account, provide the value 'default'. Configure the
+            /// policy on the destination account first. For the source account, provide
+            /// the value of the policy ID that is returned when you download the policy
+            /// that was defined on the destination account. The policy is downloaded as a
+            /// JSON file.
             /// </param>
             /// <param name='properties'>
             /// The object replication policy set to a storage account. A unique policy ID
@@ -167,8 +176,11 @@ public static ObjectReplicationPolicy CreateOrUpdate(this IObjectReplicationPoli
             /// numbers and lower-case letters only.
             /// </param>
             /// <param name='objectReplicationPolicyId'>
-            /// The ID of object replication policy or 'default' if the policy ID is
-            /// unknown.
+            /// For the destination account, provide the value 'default'. Configure the
+            /// policy on the destination account first. For the source account, provide
+            /// the value of the policy ID that is returned when you download the policy
+            /// that was defined on the destination account. The policy is downloaded as a
+            /// JSON file.
             /// </param>
             /// <param name='properties'>
             /// The object replication policy set to a storage account. A unique policy ID
@@ -202,8 +214,11 @@ public static ObjectReplicationPolicy CreateOrUpdate(this IObjectReplicationPoli
             /// numbers and lower-case letters only.
             /// </param>
             /// <param name='objectReplicationPolicyId'>
-            /// The ID of object replication policy or 'default' if the policy ID is
-            /// unknown.
+            /// For the destination account, provide the value 'default'. Configure the
+            /// policy on the destination account first. For the source account, provide
+            /// the value of the policy ID that is returned when you download the policy
+            /// that was defined on the destination account. The policy is downloaded as a
+            /// JSON file.
             /// </param>
             public static void Delete(this IObjectReplicationPoliciesOperations operations, string resourceGroupName, string accountName, string objectReplicationPolicyId)
             {
@@ -227,8 +242,11 @@ public static void Delete(this IObjectReplicationPoliciesOperations operations,
             /// numbers and lower-case letters only.
             /// </param>
             /// <param name='objectReplicationPolicyId'>
-            /// The ID of object replication policy or 'default' if the policy ID is
-            /// unknown.
+            /// For the destination account, provide the value 'default'. Configure the
+            /// policy on the destination account first. For the source account, provide
+            /// the value of the policy ID that is returned when you download the policy
+            /// that was defined on the destination account. The policy is downloaded as a
+            /// JSON file.
             /// </param>
             /// <param name='cancellationToken'>
             /// The cancellation token.
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 cc319c887d21b..c925d8fc53cc2 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
@@ -41,16 +41,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_StorageManageme
               }.AsEnumerable();
           }
       }
-      // BEGIN: Code Generation Metadata Section
-      public static readonly String AutoRestVersion = "v2";
-      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=v2 --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 = "719b74f77b92eb1ec3814be6c4488bcf6b651733";
-      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