diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
index 06bed70748c4..e4560176c86e 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.cs
@@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.Marshallers
     /// Class to produce the template output
     /// </summary>
     
-    #line 1 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+    #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
     public partial class RestXmlResponseUnmarshaller : BaseResponseUnmarshaller
     {
@@ -29,7 +29,7 @@ public partial class RestXmlResponseUnmarshaller : BaseResponseUnmarshaller
         public override string TransformText()
         {
             
-            #line 6 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 6 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     AddLicenseHeader();
 
@@ -40,7 +40,7 @@ public override string TransformText()
             #line hidden
             this.Write("\r\nnamespace ");
             
-            #line 12 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 12 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace));
             
             #line default
@@ -48,14 +48,14 @@ public override string TransformText()
             this.Write(".Model.Internal.MarshallTransformations\r\n{\r\n    /// <summary>\r\n    /// Response U" +
                     "nmarshaller for ");
             
-            #line 15 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 15 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName));
             
             #line default
             #line hidden
             this.Write(" operation\r\n    /// </summary>  \r\n    public class ");
             
-            #line 17 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 17 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName));
             
             #line default
@@ -71,21 +71,21 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
         {
             ");
             
-            #line 26 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 26 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.UnmarshallerBaseName));
             
             #line default
             #line hidden
             this.Write("Response response = new ");
             
-            #line 26 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 26 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name));
             
             #line default
             #line hidden
             this.Write("Response();\r\n");
             
-            #line 27 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 27 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     var payload= this.Operation.ResponsePayloadMember;
     var shouldMarshallPayload = (payload != null && payload.IsStructure);
@@ -101,7 +101,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             this.Write("            if (context.ResponseData.IsSuccessStatusCode && context.ResponseData." +
                     "ContentLength == 0)\r\n                return response;\r\n");
             
-            #line 38 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 38 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         }
 
@@ -113,14 +113,14 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\tcontext.AllowEmptyElementLookup.Add(\"");
             
-            #line 44 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 44 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(marshallName));
             
             #line default
             #line hidden
             this.Write("\");\r\n");
             
-            #line 45 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 45 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 		}
 
@@ -129,7 +129,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("            UnmarshallResult(context,response);\r\n");
             
-            #line 49 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 49 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
     
 	}
     else if (payloadIsStream)
@@ -142,14 +142,14 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("            response.");
             
-            #line 56 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 56 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(payload.PropertyName));
             
             #line default
             #line hidden
             this.Write(" = context.Stream;\r\n");
             
-            #line 57 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 57 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         }
         else if (payload.ModelShape.IsString)
@@ -161,14 +161,14 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             this.Write("        using (var sr = new StreamReader(context.Stream))\r\n        {\r\n           " +
                     " response.");
             
-            #line 64 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 64 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(payload.PropertyName));
             
             #line default
             #line hidden
             this.Write(" = sr.ReadToEnd();\r\n        }\r\n");
             
-            #line 66 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 66 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         }
         else if (payload.ModelShape.IsMemoryStream)
@@ -181,14 +181,14 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
                     "opyStream(context.Stream, ms);\r\n            ms.Seek(0, SeekOrigin.Begin);\r\n     " +
                     "       response.");
             
-            #line 75 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 75 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(payload.PropertyName));
             
             #line default
             #line hidden
             this.Write(" = ms;\r\n\r\n");
             
-            #line 77 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 77 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         }
         else
@@ -208,7 +208,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("            \r\n            return response;\r\n\t\t}\t\t\r\n");
             
-            #line 93 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 93 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     if ( this.Operation.ResponseHasBodyMembers || shouldMarshallPayload)
     {
@@ -218,7 +218,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\r\n");
             
-            #line 98 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 98 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     	if (this.Operation.ResponseBodyMembers.Count == 0 && !shouldMarshallPayload)
 	    {
@@ -229,7 +229,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             this.Write("\t\t[System.Diagnostics.CodeAnalysis.SuppressMessage(\"Microsoft.Usage\", \"CA1801:Rev" +
                     "iewUnusedParameters\", MessageId=\"response\")]\r\n");
             
-            #line 103 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 103 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 	    }
 
@@ -238,7 +238,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\tprivate static void UnmarshallResult(XmlUnmarshallerContext context, ");
             
-            #line 106 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 106 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name));
             
             #line default
@@ -246,7 +246,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             this.Write("Response response)\r\n        {\r\n            int originalDepth = context.CurrentDep" +
                     "th;\r\n            int targetDepth = originalDepth + 1;\r\n");
             
-            #line 110 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 110 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 	if (payload == null)
 	{
@@ -256,7 +256,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\tif (context.IsStartOfDocument) \r\n\t\t\t\t   targetDepth += 1;\r\n");
             
-            #line 116 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 116 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 	}
 
@@ -267,7 +267,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
                     ";\r\n            }\r\n            while (context.Read())\r\n            {\r\n\t\t\t\tif (con" +
                     "text.IsStartElement || context.IsAttribute)\r\n                {\r\n");
             
-            #line 127 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 127 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
     
         foreach (var member in this.Operation.ResponseBodyMembers)
         {
@@ -283,28 +283,28 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t\tif (context.TestExpression(\"");
             
-            #line 137 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 137 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
             
             #line default
             #line hidden
             this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n\t\t\t\t\t\tvar unmarshaller = ");
             
-            #line 139 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 139 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
             
             #line default
             #line hidden
             this.Write(";\r\n\t\t\t\t\t\tresponse.");
             
-            #line 140 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 140 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
             
             #line default
             #line hidden
             this.Write(".Add(unmarshaller.Unmarshall(context));\r\n\t\t\t\t\t\tcontinue;\r\n\t\t\t\t\t}\r\n");
             
-            #line 143 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 143 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
               
                 }
 
@@ -317,35 +317,35 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t    if (context.TestExpression(\"");
             
-            #line 150 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
+            #line 150 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
             
             #line default
             #line hidden
             this.Write("/");
             
-            #line 150 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 150 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(listMarshallName));
             
             #line default
             #line hidden
             this.Write("\", targetDepth))\r\n\t\t\t\t    {\r\n\t\t\t\t\t    var unmarshaller = ");
             
-            #line 152 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 152 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
             
             #line default
             #line hidden
             this.Write(";\r\n\t\t\t\t\t    response.");
             
-            #line 153 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 153 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
             
             #line default
             #line hidden
             this.Write(".Add(unmarshaller.Unmarshall(context));\r\n\t\t\t\t\t    continue;\r\n\t\t\t\t    }\r\n");
             
-            #line 156 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 156 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 			    }
             }
@@ -359,28 +359,28 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t\tif (context.TestExpression(\"");
             
-            #line 164 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
+            #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
             
             #line default
             #line hidden
             this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n\t\t\t\t\t\tvar unmarshaller = ");
             
-            #line 166 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 166 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
             
             #line default
             #line hidden
             this.Write(";\r\n\t\t\t\t\t\tresponse.");
             
-            #line 167 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 167 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
             
             #line default
             #line hidden
             this.Write(".Add(unmarshaller.Unmarshall(context));\r\n\t\t\t\t\t\tcontinue;\r\n\t\t\t\t\t}\r\n");
             
-            #line 170 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 170 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
                 }
                 else
@@ -391,28 +391,28 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t\tif (context.TestExpression(\"");
             
-            #line 175 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
+            #line 175 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
             
             #line default
             #line hidden
             this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n\t\t\t\t\t\tvar unmarshaller = ");
             
-            #line 177 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 177 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
             
             #line default
             #line hidden
             this.Write(";\r\n\t\t\t\t\t\tresponse.");
             
-            #line 178 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 178 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
             
             #line default
             #line hidden
             this.Write(" = unmarshaller.Unmarshall(context);\r\n\t\t\t\t\t\tcontinue;\r\n\t\t\t\t\t}\r\n");
             
-            #line 181 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 181 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
                 }                  
 			}
@@ -424,28 +424,28 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t\tif (context.TestExpression(\"");
             
-            #line 187 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(member.MarshallName));
+            #line 187 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(member)));
             
             #line default
             #line hidden
             this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n\t\t\t\t\t\tvar unmarshaller = ");
             
-            #line 189 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 189 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineTypeUnmarshallerInstantiate()));
             
             #line default
             #line hidden
             this.Write(";\r\n\t\t\t\t\t\tresponse.");
             
-            #line 190 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 190 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName));
             
             #line default
             #line hidden
             this.Write(" = unmarshaller.Unmarshall(context);\r\n\t\t\t\t\t\tcontinue;\r\n\t\t\t\t\t}\r\n");
             
-            #line 193 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 193 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
 			}
         }
@@ -458,28 +458,28 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
             #line hidden
             this.Write("\t\t\t\t\tif (context.TestExpression(\"");
             
-            #line 200 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
-            this.Write(this.ToStringHelper.ToStringWithCulture(payload.MarshallName));
+            #line 200 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            this.Write(this.ToStringHelper.ToStringWithCulture(DetermineXmlMarshallName(payload)));
             
             #line default
             #line hidden
             this.Write("\", targetDepth))\r\n\t\t\t\t\t{\r\n\t\t\t\t\t\tvar unmarshaller = ");
             
-            #line 202 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 202 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(payload.DetermineTypeUnmarshallerInstantiate()));
             
             #line default
             #line hidden
             this.Write(";\r\n\t\t\t\t\t\tresponse.");
             
-            #line 203 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(payload.PropertyName));
             
             #line default
             #line hidden
             this.Write(" = unmarshaller.Unmarshall(context);\r\n\t\t\t\t\t\tcontinue;\r\n\t\t\t\t\t}\r\n");
             
-            #line 206 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 206 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
         }
 
@@ -490,7 +490,7 @@ public override AmazonWebServiceResponse Unmarshall(XmlUnmarshallerContext conte
                     "\r\n                {\r\n                    return;\r\n                }\r\n           " +
                     " }\r\n          \r\n            return;\r\n        }\r\n");
             
-            #line 218 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 218 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     }
 
@@ -519,7 +519,7 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             {
 ");
             
-            #line 240 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 240 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     foreach (var exception in this.Operation.Exceptions)
     {
@@ -529,14 +529,14 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             #line hidden
             this.Write("                if (errorResponse.Code != null && errorResponse.Code.Equals(\"");
             
-            #line 244 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 244 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(exception.Code));
             
             #line default
             #line hidden
             this.Write("\"))\r\n                {\r\n                    return ");
             
-            #line 246 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 246 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(exception.Name));
             
             #line default
@@ -544,7 +544,7 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             this.Write("Unmarshaller.Instance.Unmarshall(contextCopy, errorResponse);\r\n                }\r" +
                     "\n");
             
-            #line 248 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 248 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     }
 
@@ -553,7 +553,7 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             #line hidden
             this.Write("            }\r\n            return new ");
             
-            #line 252 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 252 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseException));
             
             #line default
@@ -561,16 +561,41 @@ public override AmazonServiceException UnmarshallException(XmlUnmarshallerContex
             this.Write("(errorResponse.Message, innerException, errorResponse.Type, errorResponse.Code, e" +
                     "rrorResponse.RequestId, statusCode);\r\n        }\r\n\r\n");
             
-            #line 255 "C:\Dev\repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+            #line 255 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
 
     this.AddResponseSingletonMethod();
 
             
             #line default
             #line hidden
-            this.Write("    }\r\n}");
+            this.Write("    }\r\n}\r\n");
             return this.GenerationEnvironment.ToString();
         }
+        
+        #line 260 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\Marshallers\RestXmlResponseUnmarshaller.tt"
+
+    /* The rules for determining the marshallName for xml services is different than json services
+        1. Use the member locationName if the value doesn't match the member's name
+        2. Use the value of the locationName on the member's target if present
+        3. Use the name of the member's target
+    */
+    protected string DetermineXmlMarshallName(Member member)
+    {
+        var locationName = member.data[ServiceModel.LocationNameKey];
+        if (locationName == null)
+            return member.MarshallName;
+        if (!string.Equals(locationName.ToString(), member.ModeledName, StringComparison.Ordinal))
+        {
+            return locationName.ToString();
+        }
+        var memberTarget = member.Shape.data[ServiceModel.LocationNameKey];
+
+        return memberTarget != null ? memberTarget.ToString() : member.Shape.Name;
+    }
+
+        
+        #line default
+        #line hidden
     }
     
     #line default
diff --git a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
index 34be6c2c7caf..aa73bda0797e 100644
--- a/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
+++ b/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlResponseUnmarshaller.tt
@@ -147,7 +147,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
                 else
                 {
 #>
-				    if (context.TestExpression("<#=member.MarshallName#>/<#=listMarshallName#>", targetDepth))
+				    if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>/<#=listMarshallName#>", targetDepth))
 				    {
 					    var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 					    response.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
@@ -161,7 +161,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
                 if(member.IsFlattened)
                 {
 #>
-					if (context.TestExpression("<#=member.MarshallName#>", targetDepth))
+					if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>", targetDepth))
 					{
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						response.<#=member.PropertyName#>.Add(unmarshaller.Unmarshall(context));
@@ -172,7 +172,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
                 else
                 {
 #>
-					if (context.TestExpression("<#=member.MarshallName#>", targetDepth))
+					if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>", targetDepth))
 					{
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						response.<#=member.PropertyName#> = unmarshaller.Unmarshall(context);
@@ -184,7 +184,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
 			else
 			{
 #>
-					if (context.TestExpression("<#=member.MarshallName#>", targetDepth))
+					if (context.TestExpression("<#=DetermineXmlMarshallName(member)#>", targetDepth))
 					{
 						var unmarshaller = <#= member.DetermineTypeUnmarshallerInstantiate() #>;
 						response.<#=member.PropertyName#> = unmarshaller.Unmarshall(context);
@@ -197,7 +197,7 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
         if (shouldMarshallPayload)
         {
 #>
-					if (context.TestExpression("<#=payload.MarshallName#>", targetDepth))
+					if (context.TestExpression("<#=DetermineXmlMarshallName(payload)#>", targetDepth))
 					{
 						var unmarshaller = <#= payload.DetermineTypeUnmarshallerInstantiate() #>;
 						response.<#=payload.PropertyName#> = unmarshaller.Unmarshall(context);
@@ -256,4 +256,24 @@ namespace <#=this.Config.Namespace #>.Model.Internal.MarshallTransformations
     this.AddResponseSingletonMethod();
 #>
     }
-}
\ No newline at end of file
+}
+<#+
+    /* The rules for determining the marshallName for xml services is different than json services
+        1. Use the member locationName if the value doesn't match the member's name
+        2. Use the value of the locationName on the member's target if present
+        3. Use the name of the member's target
+    */
+    protected string DetermineXmlMarshallName(Member member)
+    {
+        var locationName = member.data[ServiceModel.LocationNameKey];
+        if (locationName == null)
+            return member.MarshallName;
+        if (!string.Equals(locationName.ToString(), member.ModeledName, StringComparison.Ordinal))
+        {
+            return locationName.ToString();
+        }
+        var memberTarget = member.Shape.data[ServiceModel.LocationNameKey];
+
+        return memberTarget != null ? memberTarget.ToString() : member.Shape.Name;
+    }
+#>
\ No newline at end of file
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs
index a6fe55a52615..d69406f45f8a 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapRequestMarshaller.cs
@@ -70,8 +70,8 @@ public IRequest Marshall(FlattenedXmlMapRequest publicRequest)
                         xmlWriter.WriteElementString("key", kvp.Key);
                         xmlWriter.WriteElementString("value", kvp.Value);
                         xmlWriter.WriteEndElement();
-                    }
-                    xmlWriter.WriteEndElement();
+                    }    
+                }
 
                 xmlWriter.WriteEndElement();
             }
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs
index 762ed4091117..7e1fe6799334 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/FlattenedXmlMapWithXmlNameRequestMarshaller.cs
@@ -66,12 +66,12 @@ public IRequest Marshall(FlattenedXmlMapWithXmlNameRequest publicRequest)
                 {
                     foreach (var kvp in publicRequest.MyMap)
                     {
-                        xmlWriter.WriteStartElement("entry");
+                        xmlWriter.WriteStartElement("KVP");
                         xmlWriter.WriteElementString("K", kvp.Key);
                         xmlWriter.WriteElementString("V", kvp.Value);
                         xmlWriter.WriteEndElement();
-                    }
-                    xmlWriter.WriteEndElement();
+                    }    
+                }
 
                 xmlWriter.WriteEndElement();
             }
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithStructureResponseUnmarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithStructureResponseUnmarshaller.cs
index b836013a345c..5ee471d6c934 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithStructureResponseUnmarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithStructureResponseUnmarshaller.cs
@@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
-                    if (context.TestExpression("nested", targetDepth))
+                    if (context.TestExpression("NestedPayload", targetDepth))
                     {
                         var unmarshaller = NestedPayloadUnmarshaller.Instance;
                         response.Nested = unmarshaller.Unmarshall(context);
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithUnionResponseUnmarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithUnionResponseUnmarshaller.cs
index 31bb2ccb6cb0..fc91794c0e6e 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithUnionResponseUnmarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithUnionResponseUnmarshaller.cs
@@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
-                    if (context.TestExpression("nested", targetDepth))
+                    if (context.TestExpression("UnionPayload", targetDepth))
                     {
                         var unmarshaller = UnionPayloadUnmarshaller.Instance;
                         response.Nested = unmarshaller.Unmarshall(context);
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNameResponseUnmarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNameResponseUnmarshaller.cs
index f4083b6a59b2..b3b5333919c4 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNameResponseUnmarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNameResponseUnmarshaller.cs
@@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
-                    if (context.TestExpression("nested", targetDepth))
+                    if (context.TestExpression("Hello", targetDepth))
                     {
                         var unmarshaller = PayloadWithXmlNameUnmarshaller.Instance;
                         response.Nested = unmarshaller.Unmarshall(context);
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceAndPrefixResponseUnmarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceAndPrefixResponseUnmarshaller.cs
index a6eb4bb03f34..b294cc9654e2 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceAndPrefixResponseUnmarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceAndPrefixResponseUnmarshaller.cs
@@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
-                    if (context.TestExpression("nested", targetDepth))
+                    if (context.TestExpression("PayloadWithXmlNamespaceAndPrefix", targetDepth))
                     {
                         var unmarshaller = PayloadWithXmlNamespaceAndPrefixUnmarshaller.Instance;
                         response.Nested = unmarshaller.Unmarshall(context);
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceResponseUnmarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceResponseUnmarshaller.cs
index 3984ac96efef..d032439beef8 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceResponseUnmarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/HttpPayloadWithXmlNamespaceResponseUnmarshaller.cs
@@ -62,7 +62,7 @@ private static void UnmarshallResult(XmlUnmarshallerContext context, HttpPayload
             {
                 if (context.IsStartElement || context.IsAttribute)
                 {
-                    if (context.TestExpression("nested", targetDepth))
+                    if (context.TestExpression("PayloadWithXmlNamespace", targetDepth))
                     {
                         var unmarshaller = PayloadWithXmlNamespaceUnmarshaller.Instance;
                         response.Nested = unmarshaller.Unmarshall(context);
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs
index 3a57fcf65f17..12a0e2f05047 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/NestedXmlMapsRequestMarshaller.cs
@@ -77,9 +77,10 @@ public IRequest Marshall(NestedXmlMapsRequest publicRequest)
                             xmlWriter.WriteEndElement();
                         }            
                         xmlWriter.WriteEndElement();                
-                        xmlWriter.WriteEndElement();
-                    }
-                    xmlWriter.WriteEndElement();
+                    }    
+                }
+                if(publicRequest.IsSetNestedMap())
+                {
                     xmlWriter.WriteStartElement("nestedMap");
                     foreach (var kvp in publicRequest.NestedMap) 
                     {
@@ -97,6 +98,7 @@ public IRequest Marshall(NestedXmlMapsRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
 
                 xmlWriter.WriteEndElement();
             }
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs
index 7b19d4bf7149..af332d17e112 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEmptyMapsRequestMarshaller.cs
@@ -80,6 +80,7 @@ public IRequest Marshall(XmlEmptyMapsRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
 
                 xmlWriter.WriteEndElement();
             }
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs
index 02b62591240f..6537f4e6ef64 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlEnumsRequestMarshaller.cs
@@ -94,6 +94,7 @@ public IRequest Marshall(XmlEnumsRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
                 var publicRequestFooEnumSet = publicRequest.FooEnumSet;
                 if (publicRequestFooEnumSet != null && publicRequestFooEnumSet.Count > 0) 
                 {                        
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs
index 9f28370580d4..948607d8db1a 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlIntEnumsRequestMarshaller.cs
@@ -94,6 +94,7 @@ public IRequest Marshall(XmlIntEnumsRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
                 var publicRequestIntEnumSet = publicRequest.IntEnumSet;
                 if (publicRequestIntEnumSet != null && publicRequestIntEnumSet.Count > 0) 
                 {                        
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs
index 18324b4dcbda..a19acf130033 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapWithXmlNamespaceRequestMarshaller.cs
@@ -73,6 +73,7 @@ public IRequest Marshall(XmlMapWithXmlNamespaceRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
 
                 xmlWriter.WriteEndElement();
             }
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs
index c47388e3aa62..4088054f79f8 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsRequestMarshaller.cs
@@ -80,6 +80,7 @@ public IRequest Marshall(XmlMapsRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
 
                 xmlWriter.WriteEndElement();
             }
diff --git a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs
index 39d1a6aa2c4e..027d053d0033 100644
--- a/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs
+++ b/sdk/test/Services/RestXmlProtocol/Generated/Model/Internal/MarshallTransformations/XmlMapsXmlNameRequestMarshaller.cs
@@ -80,6 +80,7 @@ public IRequest Marshall(XmlMapsXmlNameRequest publicRequest)
                         xmlWriter.WriteEndElement();
                     }
                     xmlWriter.WriteEndElement();
+                }
 
                 xmlWriter.WriteEndElement();
             }