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/EffectiveRoutesParameters.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/EffectiveRoutesParameters.cs
index 38df709a8d328..5d909dbbcce04 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/EffectiveRoutesParameters.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/EffectiveRoutesParameters.cs
@@ -36,7 +36,7 @@ public EffectiveRoutesParameters()
         /// resource like RouteTable, ExpressRouteConnection,
         /// HubVirtualNetworkConnection, VpnConnection and
         /// P2SConnection.</param>
-        public EffectiveRoutesParameters(Resource resourceId = default(Resource), string virtualWanResourceType = default(string))
+        public EffectiveRoutesParameters(string resourceId = default(string), string virtualWanResourceType = default(string))
         {
             ResourceId = resourceId;
             VirtualWanResourceType = virtualWanResourceType;
@@ -53,7 +53,7 @@ public EffectiveRoutesParameters()
         /// requested.
         /// </summary>
         [JsonProperty(PropertyName = "resourceId")]
-        public Resource ResourceId { get; set; }
+        public string ResourceId { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the specified resource like RouteTable,
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/HubRouteTable.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/HubRouteTable.cs
index f4d6fae1faa83..6af63b5da34f6 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/HubRouteTable.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/HubRouteTable.cs
@@ -51,7 +51,7 @@ public HubRouteTable()
         /// <param name="etag">A unique read-only string that changes whenever
         /// the resource is updated.</param>
         /// <param name="type">Resource type.</param>
-        public HubRouteTable(string id = default(string), IList<HubRoute> routes = default(IList<HubRoute>), IList<string> labels = default(IList<string>), IList<SubResource> associatedConnections = default(IList<SubResource>), IList<SubResource> propagatingConnections = default(IList<SubResource>), string provisioningState = default(string), string name = default(string), string etag = default(string), string type = default(string))
+        public HubRouteTable(string id = default(string), IList<HubRoute> routes = default(IList<HubRoute>), IList<string> labels = default(IList<string>), IList<string> associatedConnections = default(IList<string>), IList<string> propagatingConnections = default(IList<string>), string provisioningState = default(string), string name = default(string), string etag = default(string), string type = default(string))
             : base(id)
         {
             Routes = routes;
@@ -86,13 +86,13 @@ public HubRouteTable()
         /// Gets list of all connections associated with this route table.
         /// </summary>
         [JsonProperty(PropertyName = "properties.associatedConnections")]
-        public IList<SubResource> AssociatedConnections { get; private set; }
+        public IList<string> AssociatedConnections { get; private set; }
 
         /// <summary>
         /// Gets list of all connections that advertise to this route table.
         /// </summary>
         [JsonProperty(PropertyName = "properties.propagatingConnections")]
-        public IList<SubResource> PropagatingConnections { get; private set; }
+        public IList<string> PropagatingConnections { get; private set; }
 
         /// <summary>
         /// Gets the provisioning state of the RouteTable resource. Possible
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/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/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/VirtualHubEffectiveRouteEffectiveRouteList.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualHubEffectiveRouteList.cs
similarity index 74%
rename from sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualHubEffectiveRouteEffectiveRouteList.cs
rename to sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualHubEffectiveRouteList.cs
index 18b8dfa79cc17..b3010110a689d 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualHubEffectiveRouteEffectiveRouteList.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/Models/VirtualHubEffectiveRouteList.cs
@@ -18,24 +18,24 @@ namespace Microsoft.Azure.Management.Network.Models
     /// <summary>
     /// EffectiveRoutes List.
     /// </summary>
-    public partial class VirtualHubEffectiveRouteEffectiveRouteList
+    public partial class VirtualHubEffectiveRouteList
     {
         /// <summary>
-        /// Initializes a new instance of the
-        /// VirtualHubEffectiveRouteEffectiveRouteList class.
+        /// Initializes a new instance of the VirtualHubEffectiveRouteList
+        /// class.
         /// </summary>
-        public VirtualHubEffectiveRouteEffectiveRouteList()
+        public VirtualHubEffectiveRouteList()
         {
             CustomInit();
         }
 
         /// <summary>
-        /// Initializes a new instance of the
-        /// VirtualHubEffectiveRouteEffectiveRouteList class.
+        /// Initializes a new instance of the VirtualHubEffectiveRouteList
+        /// class.
         /// </summary>
         /// <param name="value">The list of effective routes configured on the
         /// virtual hub or the specified resource.</param>
-        public VirtualHubEffectiveRouteEffectiveRouteList(IList<VirtualHubEffectiveRoute> value = default(IList<VirtualHubEffectiveRoute>))
+        public VirtualHubEffectiveRouteList(IList<VirtualHubEffectiveRoute> value = default(IList<VirtualHubEffectiveRoute>))
         {
             Value = value;
             CustomInit();
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/NatGatewaysOperations.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/NatGatewaysOperations.cs
index 878a5b985e2de..e1d9034390bb1 100644
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Generated/NatGatewaysOperations.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Generated/NatGatewaysOperations.cs
@@ -1260,24 +1260,6 @@ internal NatGatewaysOperations(NetworkManagementClient client)
                     throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
                 }
             }
-            // Deserialize Response
-            if ((int)_statusCode == 202)
-            {
-                _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
-                try
-                {
-                    _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<NatGateway>(_responseContent, Client.DeserializationSettings);
-                }
-                catch (JsonException ex)
-                {
-                    _httpRequest.Dispose();
-                    if (_httpResponse != null)
-                    {
-                        _httpResponse.Dispose();
-                    }
-                    throw new SerializationException("Unable to deserialize the response.", _responseContent, ex);
-                }
-            }
             if (_shouldTrace)
             {
                 ServiceClientTracing.Exit(_invocationId, _result);
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 9fb10e114d6bc..36fc4647bbe01 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
@@ -137,16 +137,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:\\Projects\\Generator\\azure-sdk-for-net\\sdk";
-      public static readonly String GithubForkName = "Azure";
-      public static readonly String GithubBranchName = "master";
-      public static readonly String GithubCommidId = "8b0d31e9650bf8e4ba7fb2c56a7c943f4a34441d";
-      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