diff --git a/sdk/network/Microsoft.Azure.Management.Network/src/Customizations/NetworkManagementClientCustomizations.cs b/sdk/network/Microsoft.Azure.Management.Network/src/Customizations/NetworkManagementClientCustomizations.cs
old mode 100644
new mode 100755
index 535d6b9487c0..e5388522d068
--- a/sdk/network/Microsoft.Azure.Management.Network/src/Customizations/NetworkManagementClientCustomizations.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/src/Customizations/NetworkManagementClientCustomizations.cs
@@ -16,13 +16,13 @@ partial void CustomInitialize()
         {
             // first remove the converters added by generated code for the FirewallPolicyRule and RuleCondition
             DeserializationSettings.Converters.Remove(DeserializationSettings.Converters.FirstOrDefault(c => c.GetType() == typeof(PolymorphicDeserializeJsonConverter<FirewallPolicyRule>)));
-            DeserializationSettings.Converters.Remove(DeserializationSettings.Converters.FirstOrDefault(c => c.GetType() == typeof(PolymorphicDeserializeJsonConverter<FirewallPolicyRuleCondition>)));
+            DeserializationSettings.Converters.Remove(DeserializationSettings.Converters.FirstOrDefault(c => c.GetType() == typeof(PolymorphicDeserializeJsonConverter<FirewallPolicyRuleCollection>)));
             SerializationSettings.Converters.Remove(SerializationSettings.Converters.FirstOrDefault(c => c.GetType() == typeof(PolymorphicSerializeJsonConverter<FirewallPolicyRule>)));
-            SerializationSettings.Converters.Remove(SerializationSettings.Converters.FirstOrDefault(c => c.GetType() == typeof(PolymorphicSerializeJsonConverter<FirewallPolicyRuleCondition>)));
+            SerializationSettings.Converters.Remove(SerializationSettings.Converters.FirstOrDefault(c => c.GetType() == typeof(PolymorphicSerializeJsonConverter<FirewallPolicyRuleCollection>)));
 
             // now add the correct converters
-            DeserializationSettings.Converters.Add(new PolymorphicJsonCustomConverter<FirewallPolicyRule, FirewallPolicyRuleCondition>("ruleType", "ruleConditionType"));
-            SerializationSettings.Converters.Add(new PolymorphicJsonCustomConverter<FirewallPolicyRule, FirewallPolicyRuleCondition>("ruleType", "ruleConditionType"));
+            DeserializationSettings.Converters.Add(new PolymorphicJsonCustomConverter<FirewallPolicyRuleCollection, FirewallPolicyRule>("ruleCollectionType", "ruleType"));
+            SerializationSettings.Converters.Add(new PolymorphicJsonCustomConverter<FirewallPolicyRuleCollection, FirewallPolicyRule>("ruleCollectionType", "ruleType"));
         }
     }
 }
\ No newline at end of file
diff --git a/sdk/network/Microsoft.Azure.Management.Network/tests/TestData/FirewallPolicyRuleCollectionGroupSampleResource.json b/sdk/network/Microsoft.Azure.Management.Network/tests/TestData/FirewallPolicyRuleCollectionGroupSampleResource.json
new file mode 100755
index 000000000000..f5e6aa03badb
--- /dev/null
+++ b/sdk/network/Microsoft.Azure.Management.Network/tests/TestData/FirewallPolicyRuleCollectionGroupSampleResource.json
@@ -0,0 +1,39 @@
+{
+  "location": "westus",
+  "properties": {
+    "priority": 110,
+    "name": "SampleRuleCollectionGroup",
+    "provisioningState":  "Succeeded",
+    "ruleCollections": [
+      {
+        "ruleCollectionType": "FirewallPolicyNatRuleCollection",
+        "name": "Example-Nat-Rule",
+        "priority": 230,
+        "Action": {
+          "type": "Dnat"
+        },
+        "rules": [
+          {
+            "ruleType": "NatRule",
+            "name": "nat-rule11",
+            "description": "Rule to test nested polymorphism in Firewall Policy Rule Group Resource",
+            "sourceAddresses": [
+              "10.1.25.0/24"
+            ],
+            "destinationAddresses": [
+              "13.22.11.44"
+            ],
+            "ipProtocols": [
+              "TCP"
+            ],
+            "TranslatedPort": "55001",
+            "TranslatedAddress": "10.1.22.12",
+            "destinationPorts": [
+              "55001"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/sdk/network/Microsoft.Azure.Management.Network/tests/TestData/FirewallPolicyRuleGroupSampleResource.json b/sdk/network/Microsoft.Azure.Management.Network/tests/TestData/FirewallPolicyRuleGroupSampleResource.json
deleted file mode 100644
index aab489a095d9..000000000000
--- a/sdk/network/Microsoft.Azure.Management.Network/tests/TestData/FirewallPolicyRuleGroupSampleResource.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "location": "westus",
-  "properties": {
-    "priority": 110,
-    "name": "SampleRuleGroup",
-    "provisioningState":  "Succeeded",
-    "rules": [
-      {
-        "ruleType": "FirewallPolicyNatRule",
-        "name": "Example-Nat-Rule",
-        "priority": 230,
-        "TranslatedPort": "55001",
-        "TranslatedAddress": "10.1.22.12",
-        "Action": {
-          "type": "Dnat"
-        },
-        "ruleCondition": {
-          "ruleConditionType": "NetworkRuleCondition",
-          "name": "network-condition1",
-          "description":  "Rule condition to test nested polymorphism in Firewall Policy Rule Group Resource",
-          "sourceAddresses": [
-            "10.1.25.0/24"
-          ],
-          "destinationAddresses": [
-            "13.22.11.44"
-          ],
-          "ipProtocols": [
-            "TCP"
-          ],
-          "destinationPorts": [
-            "55001"
-          ]
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyRuleGroupTestResource.cs b/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyRuleCollectionGroupTestResource.cs
old mode 100644
new mode 100755
similarity index 81%
rename from sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyRuleGroupTestResource.cs
rename to sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyRuleCollectionGroupTestResource.cs
index 7cad475b3c09..20c7a7f8c35d
--- a/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyRuleGroupTestResource.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyRuleCollectionGroupTestResource.cs
@@ -6,11 +6,11 @@ namespace Networks.Tests
     using System.IO;
     using Newtonsoft.Json.Linq;
 
-    internal static class FirewallPolicyRuleGroupTestResource
+    internal static class FirewallPolicyRuleCollectionGroupTestResource
     {
         internal static JObject GetSampleResource()
         {
-            var sampleResourceJson = File.ReadAllText("TestData/FirewallPolicyRuleGroupSampleResource.json");
+            var sampleResourceJson = File.ReadAllText("TestData/FirewallPolicyRuleCollectionGroupSampleResource.json");
             var json = sampleResourceJson.Replace("'", "\"");
             var resource = JObject.Parse(json).ToObject<JObject>();
 
diff --git a/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyTests.cs b/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyTests.cs
old mode 100644
new mode 100755
index dfdd8560a7f6..78693e110105
--- a/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyTests.cs
+++ b/sdk/network/Microsoft.Azure.Management.Network/tests/Tests/FirewallPolicyTests.cs
@@ -13,18 +13,18 @@ namespace Networks.Tests
     public class FirewallPolicyTests
     {
         [Fact()]
-        public void FirewallPolicyRuleGroupDeserializationTest()
+        public void FirewallPolicyRuleCollectionGroupDeserializationTest()
         {
             ServiceClientCredentials creds = new MockServiceClientCredentials();
             var networkManagementClient = new NetworkManagementClient(new Uri("https://management.azure.com"), creds); 
-            var responseContent = FirewallPolicyRuleGroupTestResource.GetSampleResource().ToString();
-            var ruleGroup = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject<FirewallPolicyRuleGroup>(responseContent, networkManagementClient.DeserializationSettings);
+            var responseContent = FirewallPolicyRuleCollectionGroupTestResource.GetSampleResource().ToString();
+            var ruleGroup = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject<FirewallPolicyRuleCollectionGroup>(responseContent, networkManagementClient.DeserializationSettings);
 
             Assert.True(ruleGroup != null);
-            Assert.Equal(1, ruleGroup.Rules.Count);
+            Assert.Equal(1, ruleGroup.RuleCollections.Count);
 
-            FirewallPolicyNatRule policyRule = ruleGroup.Rules[0] as FirewallPolicyNatRule;
-            Assert.Equal(typeof(NetworkRuleCondition), policyRule.RuleCondition.GetType());          
+            FirewallPolicyNatRuleCollection policyRule = ruleGroup.RuleCollections[0] as FirewallPolicyNatRuleCollection;
+            Assert.Equal(typeof(NatRule), policyRule.Rules[0].GetType());          
             
         }
     }