Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.Xaml/System.Xaml/XamlMember.cs

@@ -236,9 +236,9 @@ namespace System.Xaml
 			get { return LookupValueSerializer (); }
 		}
 
-		public static bool operator == (XamlMember left, XamlMember right)
+		public static bool operator == (XamlMember xamlMember1, XamlMember xamlMember2)
 		{
-			return IsNull (left) ? IsNull (right) : left.Equals (right);
+			return IsNull (xamlMember1) ? IsNull (xamlMember2) : xamlMember1.Equals (xamlMember2);
 		}
 
 		static bool IsNull (XamlMember a)
@@ -246,14 +246,14 @@ namespace System.Xaml
 			return Object.ReferenceEquals (a, null);
 		}
 
-		public static bool operator != (XamlMember left, XamlMember right)
+		public static bool operator != (XamlMember xamlMember1, XamlMember xamlMember2)
 		{
-			return !(left == right);
+			return !(xamlMember1 == xamlMember2);
 		}
 		
-		public override bool Equals (object other)
+		public override bool Equals (object obj)
 		{
-			var x = other as XamlMember;
+			var x = obj as XamlMember;
 			return Equals (x);
 		}
 		

mcs/class/System.Xaml/System.Xaml/XamlServices.cs

@@ -83,23 +83,23 @@ namespace System.Xaml
 				Save (xw, instance);
 		}
 
-		public static void Save (TextWriter textWriter, object instance)
+		public static void Save (TextWriter writer, object instance)
 		{
-			using (var xw = XmlWriter.Create (textWriter, new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = true }))
+			using (var xw = XmlWriter.Create (writer, new XmlWriterSettings () { OmitXmlDeclaration = true, Indent = true }))
 				Save (xw, instance);
 		}
 
-		public static void Save (XmlWriter xmlWriter, object instance)
+		public static void Save (XmlWriter writer, object instance)
 		{
-			Save (new XamlXmlWriter (xmlWriter, new XamlSchemaContext ()), instance);
+			Save (new XamlXmlWriter (writer, new XamlSchemaContext ()), instance);
 		}
 
-		public static void Save (XamlWriter xamlWriter, object instance)
+		public static void Save (XamlWriter writer, object instance)
 		{
-			if (xamlWriter == null)
-				throw new ArgumentNullException ("xamlWriter");
-			var r = new XamlObjectReader (instance, xamlWriter.SchemaContext);
-			Transform (r, xamlWriter);
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			var r = new XamlObjectReader (instance, writer.SchemaContext);
+			Transform (r, writer);
 		}
 
 		public static void Transform (XamlReader xamlReader, XamlWriter xamlWriter)

mcs/class/System.Xaml/System.Xaml/XamlType.cs

@@ -252,9 +252,9 @@ namespace System.Xaml
 			return stn != null ? stn.Name : Name;
 		}
 
-		public static bool operator == (XamlType left, XamlType right)
+		public static bool operator == (XamlType xamlType1, XamlType xamlType2)
 		{
-			return IsNull (left) ? IsNull (right) : left.Equals (right);
+			return IsNull (xamlType1) ? IsNull (xamlType2) : xamlType1.Equals (xamlType2);
 		}
 
 		static bool IsNull (XamlType a)
@@ -262,9 +262,9 @@ namespace System.Xaml
 			return Object.ReferenceEquals (a, null);
 		}
 
-		public static bool operator != (XamlType left, XamlType right)
+		public static bool operator != (XamlType xamlType1, XamlType xamlType2)
 		{
-			return !(left == right);
+			return !(xamlType1 == xamlType2);
 		}
 		
 		public bool Equals (XamlType other)

mcs/class/System.Xaml/System.Xaml/XamlXmlWriter.cs

@@ -139,9 +139,9 @@ namespace System.Xaml
 			intl.WriteNamespace (namespaceDeclaration);
 		}
 
-		public override void WriteStartObject (XamlType xamlType)
+		public override void WriteStartObject (XamlType type)
 		{
-			intl.WriteStartObject (xamlType);
+			intl.WriteStartObject (type);
 		}
 		
 		public override void WriteValue (object value)