diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/IPublicIpAddressesOperations.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/IPublicIPAddressesOperations.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/IPublicIpAddressesOperations.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/IPublicIPAddressesOperations.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/IVirtualWANsOperations.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/IVirtualWansOperations.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/IVirtualWANsOperations.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/IVirtualWansOperations.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayFrontendIpConfiguration.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayFrontendIPConfiguration.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayFrontendIpConfiguration.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayFrontendIPConfiguration.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayIpConfiguration.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayIPConfiguration.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayIpConfiguration.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationGatewayIPConfiguration.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationRuleCondition.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationRuleCondition.cs
index 6200dcd81e09..912afd945ed8 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationRuleCondition.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/ApplicationRuleCondition.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Rule condition of type application.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("ApplicationRuleCondition")]
     public partial class ApplicationRuleCondition : FirewallPolicyRuleCondition
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyFilterRule.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyFilterRule.cs
index d18c7f0bfcc3..cf16683546f7 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyFilterRule.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyFilterRule.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Firewall Policy Filter Rule.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("FirewallPolicyFilterRule")]
     public partial class FirewallPolicyFilterRule : FirewallPolicyRule
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyNatRule.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyNatRule.cs
index 2cbdfdca2837..51e5247b15c7 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyNatRule.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyNatRule.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Firewall Policy NAT Rule.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("FirewallPolicyNatRule")]
     public partial class FirewallPolicyNatRule : FirewallPolicyRule
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRule.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRule.cs
index ac9496a79e2a..80cd0f1a2d54 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRule.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRule.cs
@@ -17,6 +17,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Properties of the rule.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("FirewallPolicyRule")]
     public partial class FirewallPolicyRule
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRuleCondition.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRuleCondition.cs
index 82e14173b0c8..5ff3aebd99e4 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRuleCondition.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FirewallPolicyRuleCondition.cs
@@ -16,6 +16,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Properties of a rule.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("FirewallPolicyRuleCondition")]
     public partial class FirewallPolicyRuleCondition
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FrontendIpConfiguration.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FrontendIPConfiguration.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FrontendIpConfiguration.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/FrontendIPConfiguration.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/IpAllocationMethod.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/IPAllocationMethod.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/IpAllocationMethod.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/IPAllocationMethod.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NatRuleCondition.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NatRuleCondition.cs
index a6e89caf664e..c4bd5a1e2fb7 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NatRuleCondition.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NatRuleCondition.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Rule condition of type nat.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("NatRuleCondition")]
     public partial class NatRuleCondition : FirewallPolicyRuleCondition
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkInterfaceIpConfiguration.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkInterfaceIPConfiguration.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkInterfaceIpConfiguration.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkInterfaceIPConfiguration.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkRuleCondition.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkRuleCondition.cs
index ee3a6460cdd7..6287ed0d1bda 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkRuleCondition.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/NetworkRuleCondition.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// Rule condition of type network.
     /// </summary>
+    [Newtonsoft.Json.JsonObject("NetworkRuleCondition")]
     public partial class NetworkRuleCondition : FirewallPolicyRuleCondition
     {
         /// <summary>
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/P2SVpnGateway.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/P2SVpnGateway.cs
index 2b8dcf47cdd7..fef8a178240d 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/P2SVpnGateway.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/P2SVpnGateway.cs
@@ -52,11 +52,9 @@ public P2SVpnGateway()
         /// which the p2sVpnGateway is attached to.</param>
         /// <param name="vpnClientConnectionHealth">All P2S VPN clients'
         /// connection health status.</param>
-        /// <param name="customDnsServers">List of all customer specified DNS
-        /// servers IP addresses.</param>
         /// <param name="etag">A unique read-only string that changes whenever
         /// the resource is updated.</param>
-        public P2SVpnGateway(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), SubResource virtualHub = default(SubResource), IList<P2SConnectionConfiguration> p2SConnectionConfigurations = default(IList<P2SConnectionConfiguration>), string provisioningState = default(string), int? vpnGatewayScaleUnit = default(int?), SubResource vpnServerConfiguration = default(SubResource), VpnClientConnectionHealth vpnClientConnectionHealth = default(VpnClientConnectionHealth), IList<string> customDnsServers = default(IList<string>), string etag = default(string))
+        public P2SVpnGateway(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary<string, string> tags = default(IDictionary<string, string>), SubResource virtualHub = default(SubResource), IList<P2SConnectionConfiguration> p2SConnectionConfigurations = default(IList<P2SConnectionConfiguration>), string provisioningState = default(string), int? vpnGatewayScaleUnit = default(int?), SubResource vpnServerConfiguration = default(SubResource), VpnClientConnectionHealth vpnClientConnectionHealth = default(VpnClientConnectionHealth), string etag = default(string))
             : base(id, name, type, location, tags)
         {
             VirtualHub = virtualHub;
@@ -65,7 +63,6 @@ public P2SVpnGateway()
             VpnGatewayScaleUnit = vpnGatewayScaleUnit;
             VpnServerConfiguration = vpnServerConfiguration;
             VpnClientConnectionHealth = vpnClientConnectionHealth;
-            CustomDnsServers = customDnsServers;
             Etag = etag;
             CustomInit();
         }
@@ -115,13 +112,6 @@ public P2SVpnGateway()
         [JsonProperty(PropertyName = "properties.vpnClientConnectionHealth")]
         public VpnClientConnectionHealth VpnClientConnectionHealth { get; private set; }
 
-        /// <summary>
-        /// Gets or sets list of all customer specified DNS servers IP
-        /// addresses.
-        /// </summary>
-        [JsonProperty(PropertyName = "properties.customDnsServers")]
-        public IList<string> CustomDnsServers { get; set; }
-
         /// <summary>
         /// Gets a unique read-only string that changes whenever the resource
         /// is updated.
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIpAddress.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIPAddress.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIpAddress.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIPAddress.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIpAddressDnsSettings.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIPAddressDnsSettings.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIpAddressDnsSettings.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/PublicIPAddressDnsSettings.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualNetworkGatewayIpConfiguration.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualNetworkGatewayIPConfiguration.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualNetworkGatewayIpConfiguration.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualNetworkGatewayIPConfiguration.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIpAddressesOperations.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIPAddressesOperations.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIpAddressesOperations.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIPAddressesOperations.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIpAddressesOperationsExtensions.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIPAddressesOperationsExtensions.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIpAddressesOperationsExtensions.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/PublicIPAddressesOperationsExtensions.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/SdkInfo_NetworkManagementClient.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/SdkInfo_NetworkManagementClient.cs
index 54644b55fd92..61fa0245c68b 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/SdkInfo_NetworkManagementClient.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/SdkInfo_NetworkManagementClient.cs
@@ -126,16 +126,5 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_NetworkManageme
               }.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/network/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\git\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "aee4a584518813e6f44e36d6de68439c0a806c5a";
-      public static readonly String CodeGenerationErrors = "";
-      public static readonly String GithubRepoName = "azure-rest-api-specs";
-      // END: Code Generation Metadata Section
   }
 }
-
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWANsOperations.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWansOperations.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWANsOperations.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWansOperations.cs
diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWANsOperationsExtensions.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWansOperationsExtensions.cs
similarity index 100%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWANsOperationsExtensions.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/VirtualWansOperationsExtensions.cs