[System.ServiceModel] Rename method parameters to match .NET contract

104 files changed, 552 insertions, 552 deletions

diff --git a/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs b/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs
index 3e79f9e85ac..dc046928ad3 100644
--- a/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs
+++ b/mcs/class/System.ServiceModel/System.Collections.Generic/KeyedByTypeCollection.cs
@@ -65,14 +65,14 @@ namespace System.Collections.Generic
 			return list;
 		}
 
-		protected override void InsertItem (int index, TItem kind)
+		protected override void InsertItem (int index, TItem item)
 		{
-			base.InsertItem (index, kind);
+			base.InsertItem (index, item);
 		}
 
-		protected override void SetItem (int index, TItem kind)
+		protected override void SetItem (int index, TItem item)
 		{
-			base.SetItem (index, kind);
+			base.SetItem (index, item);
 		}
 
 		public T Remove<T> ()
diff --git a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs
index 5e47797fc3f..b110d15f243 100644
--- a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs
+++ b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedKeyedCollection.cs
@@ -57,10 +57,10 @@ namespace System.Collections.Generic
 		}
 
 		protected SynchronizedKeyedCollection (object syncRoot,
-			IEqualityComparer<K> comparer, int capacity)
+			IEqualityComparer<K> comparer, int dictionaryCreationThreshold)
 			: base (syncRoot)
 		{
-			dict = new Dictionary<K, T> (capacity, comparer);
+			dict = new Dictionary<K, T> (dictionaryCreationThreshold, comparer);
 		}
 
 		// see bug #76417
diff --git a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs
index fdc7c3e56e7..b7924ff5a78 100644
--- a/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs
+++ b/mcs/class/System.ServiceModel/System.Collections.Generic/SynchronizedReadOnlyCollection.cs
@@ -43,25 +43,25 @@ namespace System.Collections.Generic
 		{
 		}
 
-		public SynchronizedReadOnlyCollection (object sync_root)
-			: this (sync_root, new List<T> ())
+		public SynchronizedReadOnlyCollection (object syncRoot)
+			: this (syncRoot, new List<T> ())
 		{
 		}
 
-		public SynchronizedReadOnlyCollection (object sync_root, IEnumerable<T> list)
+		public SynchronizedReadOnlyCollection (object syncRoot, IEnumerable<T> list)
 		{
-			if (sync_root == null)
-				throw new ArgumentNullException ("sync_root");
+			if (syncRoot == null)
+				throw new ArgumentNullException ("syncRoot");
 
 			if (list == null)
 				throw new ArgumentNullException ("list");
 
-			this.sync_root = sync_root;
+			this.sync_root = syncRoot;
 			this.l = new List<T> (list);
 		}
 
-		public SynchronizedReadOnlyCollection (object sync_root, params T [] list)
-			: this (sync_root, (IEnumerable<T>) list)
+		public SynchronizedReadOnlyCollection (object syncRoot, params T [] list)
+			: this (syncRoot, (IEnumerable<T>) list)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs
index 9e66babb71a..5d942eebb25 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Binding.cs
@@ -176,7 +176,7 @@ namespace System.ServiceModel.Channels
 
 		public virtual IChannelListener<TChannel>
 			BuildChannelListener<TChannel> (
-			Uri listenUri,
+			Uri listenUriBaseAddress,
 			params object [] parameters)
 			where TChannel : class, IChannel
 		{
@@ -184,16 +184,16 @@ namespace System.ServiceModel.Channels
 				new BindingParameterCollection ();
 			foreach (object o in parameters)
 				pl.Add (o);
-			return BuildChannelListener<TChannel> (listenUri, pl);
+			return BuildChannelListener<TChannel> (listenUriBaseAddress, pl);
 		}
 
 		public virtual IChannelListener<TChannel>
 			BuildChannelListener<TChannel> (
-			Uri listenUri,
+			Uri listenUriBaseAddress,
 			BindingParameterCollection parameters)
 			where TChannel : class, IChannel
 		{
-			return BuildChannelListener<TChannel> (listenUri,
+			return BuildChannelListener<TChannel> (listenUriBaseAddress,
 				String.Empty, parameters);
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs
index be4ff59937a..7c2936e07ac 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/ChannelListenerBase_1.cs
@@ -197,16 +197,16 @@ namespace System.ServiceModel.Channels
 		}
 
 		public IAsyncResult BeginAcceptChannel (
-			AsyncCallback callback, object asyncState)
+			AsyncCallback callback, object state)
 		{
 			return BeginAcceptChannel (
-				timeouts.ReceiveTimeout, callback, asyncState);
+				timeouts.ReceiveTimeout, callback, state);
 		}
 
 		public IAsyncResult BeginAcceptChannel (TimeSpan timeout,
-			AsyncCallback callback, object asyncState)
+			AsyncCallback callback, object state)
 		{
-			return OnBeginAcceptChannel (timeout, callback, asyncState);
+			return OnBeginAcceptChannel (timeout, callback, state);
 		}
 
 		public TChannel EndAcceptChannel (IAsyncResult result)
@@ -217,7 +217,7 @@ namespace System.ServiceModel.Channels
 		protected abstract TChannel OnAcceptChannel (TimeSpan timeout);
 
 		protected abstract IAsyncResult OnBeginAcceptChannel (TimeSpan timeout,
-			AsyncCallback callback, object asyncState);
+			AsyncCallback callback, object state);
 
 		protected abstract TChannel OnEndAcceptChannel (IAsyncResult result);
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
index feb1f9ae775..c1630966b01 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/CustomBinding.cs
@@ -43,8 +43,8 @@ namespace System.ServiceModel.Channels
 		ISecurityCapabilities security;
 		string scheme = "";
 
-		public CustomBinding (string name)
-			: this (name, default_ns)
+		public CustomBinding (string configurationName)
+			: this (configurationName, default_ns)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs
index 1b6be5ad60d..a5e5b39ec65 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/Message.cs
@@ -334,19 +334,19 @@ namespace System.ServiceModel.Channels
 
 		// 1)
 		public static Message CreateMessage (MessageVersion version,
-			FaultCode code, string reason, string action)
+			FaultCode faultCode, string reason, string action)
 		{
-			MessageFault fault = MessageFault.CreateFault (code, reason);
+			MessageFault fault = MessageFault.CreateFault (faultCode, reason);
 			return CreateMessage (version, fault, action);
 		}
 
 		// 2)
 		public static Message CreateMessage (MessageVersion version,
-			FaultCode code, string reason, object detail,
+			FaultCode faultCode, string reason, object detail,
 			string action)
 		{
 			MessageFault fault = MessageFault.CreateFault (
-				code, new FaultReason (reason), detail);
+				faultCode, new FaultReason (reason), detail);
 			return CreateMessage (version, fault, action);
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs
index ecbf261c316..1bb8186155d 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageBuffer.cs
@@ -47,9 +47,9 @@ namespace System.ServiceModel.Channels {
 			return CreateNavigator (XmlSpace.Default);
 		}
 
-		public XPathNavigator CreateNavigator (int node_quota)
+		public XPathNavigator CreateNavigator (int nodeQuota)
 		{
-			return CreateNavigator (node_quota, XmlSpace.Default);
+			return CreateNavigator (nodeQuota, XmlSpace.Default);
 		}
 
 		[MonoTODO ("supply proper quota")]
@@ -60,10 +60,10 @@ namespace System.ServiceModel.Channels {
 		}
 
 		[MonoTODO ("Handle node_quota and xmlspace")]
-		public XPathNavigator CreateNavigator (int node_quota, XmlSpace space)
+		public XPathNavigator CreateNavigator (int nodeQuota, XmlSpace space)
 		{
 			if (nav_cache == null) {
-				DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), node_quota);
+				DTMXPathDocumentWriter2 pw = new DTMXPathDocumentWriter2 (new NameTable (), nodeQuota);
 				XmlDictionaryWriter w = XmlDictionaryWriter.CreateDictionaryWriter (pw);
 				CreateMessage ().WriteMessage (w);
 				nav_cache = pw.CreateDocument ().CreateNavigator ();
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
index 8527e5c3134..6e3675e95a2 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageFault.cs
@@ -220,26 +220,26 @@ namespace System.ServiceModel.Channels
 
 		public static MessageFault CreateFault (FaultCode code,
 			FaultReason reason, object detail,
-			XmlObjectSerializer formatter)
+			XmlObjectSerializer serializer)
 		{
 			return new SimpleMessageFault (code, reason, true,
-				detail, formatter, String.Empty, String.Empty);
+				detail, serializer, String.Empty, String.Empty);
 		}
 
 		public static MessageFault CreateFault (FaultCode code,
 			FaultReason reason, object detail,
-			XmlObjectSerializer formatter, string actor)
+			XmlObjectSerializer serializer, string actor)
 		{
 			return new SimpleMessageFault (code, reason,
-				true, detail, formatter, actor, String.Empty);
+				true, detail, serializer, actor, String.Empty);
 		}
 
 		public static MessageFault CreateFault (FaultCode code,
 			FaultReason reason, object detail,
-			XmlObjectSerializer formatter, string actor, string node)
+			XmlObjectSerializer serializer, string actor, string node)
 		{
 			return new SimpleMessageFault (code, reason,
-				true, detail, formatter, actor, node);
+				true, detail, serializer, actor, node);
 		}
 
 		// pretty simple implementation class
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
index c08ef8697dd..3ee4ef203de 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MessageHeaders.cs
@@ -50,10 +50,10 @@ namespace System.ServiceModel.Channels
 			new Dictionary<Type, XmlObjectSerializer> ();
 		MessageVersion version;
 
-		public MessageHeaders (MessageHeaders headers)
-			: this (headers.MessageVersion)
+		public MessageHeaders (MessageHeaders collection)
+			: this (collection.MessageVersion)
 		{
-			CopyHeadersFrom (headers);
+			CopyHeadersFrom (collection);
 		}
 
 		public MessageHeaders (MessageVersion version)
@@ -61,10 +61,10 @@ namespace System.ServiceModel.Channels
 		{
 		}
 
-		public MessageHeaders (MessageVersion version, int capacity)
+		public MessageHeaders (MessageVersion version, int initialSize)
 		{
 			this.version = version;
-			l = new List<MessageHeaderInfo> (capacity);
+			l = new List<MessageHeaderInfo> (initialSize);
 		}
 		
 		public void Add (MessageHeader header)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs
index 2b43d40adf1..5faeb48c502 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/MtomMessageEncodingBindingElement.cs
@@ -49,10 +49,10 @@ namespace System.ServiceModel.Channels
 		}
 
 		public MtomMessageEncodingBindingElement (
-			MessageVersion version, Encoding encoding)
+			MessageVersion messageVersion, Encoding writeEncoding)
 		{
-			this.version = version;
-			this.encoding = encoding;
+			this.version = messageVersion;
+			this.encoding = writeEncoding;
 		}
 
 		public int MaxBufferSize {
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs
index 759bafd5b16..674d6cef46f 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/NamedPipetransportBindingElement.cs
@@ -41,10 +41,10 @@ namespace System.ServiceModel.Channels
 		}
 
 		protected NamedPipeTransportBindingElement (
-			NamedPipeTransportBindingElement other)
-			: base (other)
+			NamedPipeTransportBindingElement elementToBeCloned)
+			: base (elementToBeCloned)
 		{
-			pool.CopyPropertiesFrom (other.pool);
+			pool.CopyPropertiesFrom (elementToBeCloned.pool);
 		}
 
 		NamedPipeConnectionPoolSettings pool = new NamedPipeConnectionPoolSettings ();
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs
index 0a5fa43897a..f6b58f582a3 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/StreamUpgradeBindingElement.cs
@@ -37,7 +37,7 @@ namespace System.ServiceModel.Channels
 		{
 		}
 
-		protected StreamUpgradeBindingElement (StreamUpgradeBindingElement other)
+		protected StreamUpgradeBindingElement (StreamUpgradeBindingElement elementToBeCloned)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
index dee266e465b..07356fb4183 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/TransactionFlowBindingElement.cs
@@ -45,9 +45,9 @@ namespace System.ServiceModel.Channels
 		{
 		}
 
-		public TransactionFlowBindingElement (TransactionProtocol protocol)
+		public TransactionFlowBindingElement (TransactionProtocol transactionProtocol)
 		{
-			this.protocol = protocol;
+			this.protocol = transactionProtocol;
 		}
 
 		public TransactionProtocol TransactionProtocol {
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs
index cea035495e2..92f746e2236 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Channels/UnderstoodHeaders.cs
@@ -40,14 +40,14 @@ namespace System.ServiceModel.Channels
 		{
 			headers = new List<MessageHeaderInfo> ();
 		}
-		public void Add (MessageHeaderInfo header)
+		public void Add (MessageHeaderInfo headerInfo)
 		{
-			headers.Add (header);
+			headers.Add (headerInfo);
 		}
 
-		public bool Contains (MessageHeaderInfo header)
+		public bool Contains (MessageHeaderInfo headerInfo)
 		{
-			return headers.Contains (header);
+			return headers.Contains (headerInfo);
 		}
 
 		public IEnumerator<MessageHeaderInfo> GetEnumerator ()
@@ -55,9 +55,9 @@ namespace System.ServiceModel.Channels
 			return headers.GetEnumerator ();
 		}
 
-		public void Remove (MessageHeaderInfo header)
+		public void Remove (MessageHeaderInfo headerInfo)
 		{
-			headers.Remove (header);
+			headers.Remove (headerInfo);
 		}
 
 		IEnumerator IEnumerable.GetEnumerator ()
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs
index a83fffc8b2e..a69522b599e 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BinaryMessageEncodingElement.cs
@@ -111,9 +111,9 @@ namespace System.ServiceModel.Configuration
 			return new BinaryMessageEncodingBindingElement ();
 		}
 
-		public override void ApplyConfiguration (BindingElement element)
+		public override void ApplyConfiguration (BindingElement bindingElement)
 		{
-			var b = (BinaryMessageEncodingBindingElement) element;
+			var b = (BinaryMessageEncodingBindingElement) bindingElement;
 			b.MaxReadPoolSize = MaxReadPoolSize;
 			b.MaxSessionSize = MaxSessionSize;
 			b.MaxWritePoolSize = MaxWritePoolSize;
@@ -121,9 +121,9 @@ namespace System.ServiceModel.Configuration
 			ReaderQuotas.ApplyConfiguration (b.ReaderQuotas);
 		}
 
-		public override void CopyFrom (ServiceModelExtensionElement element)
+		public override void CopyFrom (ServiceModelExtensionElement from)
 		{
-			var b = (BinaryMessageEncodingElement) element;
+			var b = (BinaryMessageEncodingElement) from;
 			MaxReadPoolSize = b.MaxReadPoolSize;
 			MaxSessionSize = b.MaxSessionSize;
 			MaxWritePoolSize = b.MaxWritePoolSize;
@@ -131,9 +131,9 @@ namespace System.ServiceModel.Configuration
 			ReaderQuotas.CopyFrom (b.ReaderQuotas);
 		}
 
-		protected internal override void InitializeFrom (BindingElement element)
+		protected internal override void InitializeFrom (BindingElement bindingElement)
 		{
-			var b = (BinaryMessageEncodingBindingElement) element;
+			var b = (BinaryMessageEncodingBindingElement) bindingElement;
 			MaxReadPoolSize = b.MaxReadPoolSize;
 			MaxSessionSize = b.MaxSessionSize;
 			MaxWritePoolSize = b.MaxWritePoolSize;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs
index 1b17fc25e3f..8d084641976 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/BindingsSection.cs
@@ -165,12 +165,12 @@ namespace System.ServiceModel.Configuration
 			return sm.Bindings;
 		}
 
-		public new BindingCollectionElement this [string name] {
+		public new BindingCollectionElement this [string binding] {
 			get {
-				object element = base [name];
+				object element = base [binding];
 				if (element is BindingCollectionElement)
 					return (BindingCollectionElement) element;
-				throw new NotImplementedException (String.Format ("Could not find {0}", name));
+				throw new NotImplementedException (String.Format ("Could not find {0}", binding));
 			}
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
index 9b1300e425d..b2460ce48a9 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ClientCredentialsElement.cs
@@ -147,21 +147,21 @@ namespace System.ServiceModel.Configuration
 			return cb;
 		}
 
-		protected internal void ApplyConfiguration (ClientCredentials cb)
+		protected internal void ApplyConfiguration (ClientCredentials behavior)
 		{
-			cb.SupportInteractive = SupportInteractive;
+			behavior.SupportInteractive = SupportInteractive;
 			// how is "Type" used?
 
 			// ClientCertificate
 			if (!String.IsNullOrEmpty (ClientCertificate.FindValue))
-				cb.ClientCertificate.SetCertificate (ClientCertificate.StoreLocation, ClientCertificate.StoreName, ClientCertificate.X509FindType, ClientCertificate.FindValue);
+				behavior.ClientCertificate.SetCertificate (ClientCertificate.StoreLocation, ClientCertificate.StoreName, ClientCertificate.X509FindType, ClientCertificate.FindValue);
 
 			// HttpDigest
 			if (HttpDigest.ImpersonationLevel != TokenImpersonationLevel.None)
 				throw new NotImplementedException ();
 
 			// IssuedToken
-			var bi = cb.IssuedToken;
+			var bi = behavior.IssuedToken;
 			var ci = IssuedToken;
 			bi.CacheIssuedTokens = ci.CacheIssuedTokens;
 			bi.DefaultKeyEntropyMode = ci.DefaultKeyEntropyMode;
@@ -174,19 +174,19 @@ namespace System.ServiceModel.Configuration
 
 			// Peer
 			if (!String.IsNullOrEmpty (Peer.Certificate.FindValue))
-				cb.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue);
+				behavior.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue);
 			// cb.Peer.MeshPassword = /* cannot fill it here */
-			cb.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
-			cb.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
-			cb.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
-			cb.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
-			cb.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
-			cb.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
-			cb.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
-			cb.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation;
+			behavior.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
+			behavior.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
+			behavior.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
+			behavior.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
+			behavior.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
+			behavior.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
+			behavior.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
+			behavior.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation;
 
 			// ServiceCertificate
-			var bsc = cb.ServiceCertificate;
+			var bsc = behavior.ServiceCertificate;
 			var csc = ServiceCertificate;
 			var bsca = bsc.Authentication;
 			var csca = csc.Authentication;
@@ -202,8 +202,8 @@ namespace System.ServiceModel.Configuration
 			// cb.UserNamePassword : not configurable ...
 
 			// Windows
-			cb.Windows.AllowedImpersonationLevel = Windows.AllowedImpersonationLevel;
-			cb.Windows.AllowNtlm = Windows.AllowNtlm;
+			behavior.Windows.AllowedImpersonationLevel = Windows.AllowedImpersonationLevel;
+			behavior.Windows.AllowNtlm = Windows.AllowNtlm;
 		}
 
 		object CreateInstance (string typeName)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs
index 41220685f8a..ff1c1441357 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ReliableSessionElement.cs
@@ -150,9 +150,9 @@ namespace System.ServiceModel.Configuration
 			return new ReliableSessionBindingElement ();
 		}
 
-		public override void ApplyConfiguration (BindingElement element)
+		public override void ApplyConfiguration (BindingElement bindingElement)
 		{
-			var b = (ReliableSessionBindingElement) element;
+			var b = (ReliableSessionBindingElement) bindingElement;
 			b.AcknowledgementInterval = AcknowledgementInterval;
 			b.FlowControlEnabled = FlowControlEnabled;
 			b.InactivityTimeout = InactivityTimeout;
@@ -163,9 +163,9 @@ namespace System.ServiceModel.Configuration
 			b.ReliableMessagingVersion = ReliableMessagingVersion;
 		}
 
-		public override void CopyFrom (ServiceModelExtensionElement element)
+		public override void CopyFrom (ServiceModelExtensionElement from)
 		{
-			var b = (ReliableSessionElement) element;
+			var b = (ReliableSessionElement) from;
 			AcknowledgementInterval = b.AcknowledgementInterval;
 			FlowControlEnabled = b.FlowControlEnabled;
 			InactivityTimeout = b.InactivityTimeout;
@@ -176,9 +176,9 @@ namespace System.ServiceModel.Configuration
 			ReliableMessagingVersion = b.ReliableMessagingVersion;
 		}
 
-		protected internal override void InitializeFrom (BindingElement element)
+		protected internal override void InitializeFrom (BindingElement bindingElement)
 		{
-			var b = (ReliableSessionBindingElement) element;
+			var b = (ReliableSessionBindingElement) bindingElement;
 			AcknowledgementInterval = b.AcknowledgementInterval;
 			FlowControlEnabled = b.FlowControlEnabled;
 			InactivityTimeout = b.InactivityTimeout;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs
index 9830a57ce69..498103508ce 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceCredentialsElement.cs
@@ -132,57 +132,57 @@ namespace System.ServiceModel.Configuration
 			return sb;
 		}
 
-		protected internal void ApplyConfiguration (ServiceCredentials sb)
+		protected internal void ApplyConfiguration (ServiceCredentials behavior)
 		{
 			// IssuedToken
 			foreach (AllowedAudienceUriElement ae in IssuedTokenAuthentication.AllowedAudienceUris)
-				sb.IssuedTokenAuthentication.AllowedAudienceUris.Add (ae.AllowedAudienceUri);
-			sb.IssuedTokenAuthentication.AllowUntrustedRsaIssuers = IssuedTokenAuthentication.AllowUntrustedRsaIssuers;
-			sb.IssuedTokenAuthentication.AudienceUriMode = IssuedTokenAuthentication.AudienceUriMode;
+				behavior.IssuedTokenAuthentication.AllowedAudienceUris.Add (ae.AllowedAudienceUri);
+			behavior.IssuedTokenAuthentication.AllowUntrustedRsaIssuers = IssuedTokenAuthentication.AllowUntrustedRsaIssuers;
+			behavior.IssuedTokenAuthentication.AudienceUriMode = IssuedTokenAuthentication.AudienceUriMode;
 
 			if (!String.IsNullOrEmpty (IssuedTokenAuthentication.CustomCertificateValidatorType))
-			sb.IssuedTokenAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (IssuedTokenAuthentication.CustomCertificateValidatorType);
-			sb.IssuedTokenAuthentication.CertificateValidationMode = IssuedTokenAuthentication.CertificateValidationMode;
-			sb.IssuedTokenAuthentication.RevocationMode = IssuedTokenAuthentication.RevocationMode;
-			sb.IssuedTokenAuthentication.TrustedStoreLocation = IssuedTokenAuthentication.TrustedStoreLocation;
+			behavior.IssuedTokenAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (IssuedTokenAuthentication.CustomCertificateValidatorType);
+			behavior.IssuedTokenAuthentication.CertificateValidationMode = IssuedTokenAuthentication.CertificateValidationMode;
+			behavior.IssuedTokenAuthentication.RevocationMode = IssuedTokenAuthentication.RevocationMode;
+			behavior.IssuedTokenAuthentication.TrustedStoreLocation = IssuedTokenAuthentication.TrustedStoreLocation;
 			foreach (X509CertificateTrustedIssuerElement ce in IssuedTokenAuthentication.KnownCertificates)
-				sb.IssuedTokenAuthentication.KnownCertificates.Add (GetCertificate (ce.StoreLocation, ce.StoreName, ce.X509FindType, ce.FindValue));
+				behavior.IssuedTokenAuthentication.KnownCertificates.Add (GetCertificate (ce.StoreLocation, ce.StoreName, ce.X509FindType, ce.FindValue));
 
-			sb.IssuedTokenAuthentication.SamlSerializer = (SamlSerializer) CreateInstance (IssuedTokenAuthentication.SamlSerializerType);
+			behavior.IssuedTokenAuthentication.SamlSerializer = (SamlSerializer) CreateInstance (IssuedTokenAuthentication.SamlSerializerType);
 
 
 			// Peer
 			if (!String.IsNullOrEmpty (Peer.Certificate.FindValue))
-				sb.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue);
+				behavior.Peer.SetCertificate (Peer.Certificate.StoreLocation, Peer.Certificate.StoreName, Peer.Certificate.X509FindType, Peer.Certificate.FindValue);
 			// sb.Peer.MeshPassword = /* cannot fill it here */
-			sb.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
-			sb.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
-			sb.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
-			sb.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
-			sb.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
-			sb.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
-			sb.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
-			sb.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation;
+			behavior.Peer.MessageSenderAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.MessageSenderAuthentication.CustomCertificateValidatorType);
+			behavior.Peer.MessageSenderAuthentication.CertificateValidationMode = Peer.MessageSenderAuthentication.CertificateValidationMode;
+			behavior.Peer.MessageSenderAuthentication.RevocationMode = Peer.MessageSenderAuthentication.RevocationMode;
+			behavior.Peer.MessageSenderAuthentication.TrustedStoreLocation = Peer.MessageSenderAuthentication.TrustedStoreLocation;
+			behavior.Peer.PeerAuthentication.CustomCertificateValidator = (X509CertificateValidator) CreateInstance (Peer.PeerAuthentication.CustomCertificateValidatorType);
+			behavior.Peer.PeerAuthentication.CertificateValidationMode = Peer.PeerAuthentication.CertificateValidationMode;
+			behavior.Peer.PeerAuthentication.RevocationMode = Peer.PeerAuthentication.RevocationMode;
+			behavior.Peer.PeerAuthentication.TrustedStoreLocation = Peer.PeerAuthentication.TrustedStoreLocation;
 
 			// WSSC
-			sb.SecureConversationAuthentication.SecurityStateEncoder = (SecurityStateEncoder) CreateInstance (SecureConversationAuthentication.SecurityStateEncoderType);
+			behavior.SecureConversationAuthentication.SecurityStateEncoder = (SecurityStateEncoder) CreateInstance (SecureConversationAuthentication.SecurityStateEncoderType);
 
 			// X509
 			if (!String.IsNullOrEmpty (ServiceCertificate.FindValue))
-				sb.ServiceCertificate.SetCertificate (ServiceCertificate.StoreLocation, ServiceCertificate.StoreName, ServiceCertificate.X509FindType, ServiceCertificate.FindValue);
+				behavior.ServiceCertificate.SetCertificate (ServiceCertificate.StoreLocation, ServiceCertificate.StoreName, ServiceCertificate.X509FindType, ServiceCertificate.FindValue);
 
 			// UserNamePassword
-			sb.UserNameAuthentication.CachedLogonTokenLifetime = UserNameAuthentication.CachedLogonTokenLifetime;
-			sb.UserNameAuthentication.CacheLogonTokens = UserNameAuthentication.CacheLogonTokens;
-			sb.UserNameAuthentication.CustomUserNamePasswordValidator = (UserNamePasswordValidator) CreateInstance (UserNameAuthentication.CustomUserNamePasswordValidatorType);
-			sb.UserNameAuthentication.IncludeWindowsGroups = UserNameAuthentication.IncludeWindowsGroups;
-			sb.UserNameAuthentication.MaxCachedLogonTokens = UserNameAuthentication.MaxCachedLogonTokens;
-			sb.UserNameAuthentication.MembershipProvider = (MembershipProvider) CreateInstance (UserNameAuthentication.MembershipProviderName);
-			sb.UserNameAuthentication.UserNamePasswordValidationMode = UserNameAuthentication.UserNamePasswordValidationMode;
+			behavior.UserNameAuthentication.CachedLogonTokenLifetime = UserNameAuthentication.CachedLogonTokenLifetime;
+			behavior.UserNameAuthentication.CacheLogonTokens = UserNameAuthentication.CacheLogonTokens;
+			behavior.UserNameAuthentication.CustomUserNamePasswordValidator = (UserNamePasswordValidator) CreateInstance (UserNameAuthentication.CustomUserNamePasswordValidatorType);
+			behavior.UserNameAuthentication.IncludeWindowsGroups = UserNameAuthentication.IncludeWindowsGroups;
+			behavior.UserNameAuthentication.MaxCachedLogonTokens = UserNameAuthentication.MaxCachedLogonTokens;
+			behavior.UserNameAuthentication.MembershipProvider = (MembershipProvider) CreateInstance (UserNameAuthentication.MembershipProviderName);
+			behavior.UserNameAuthentication.UserNamePasswordValidationMode = UserNameAuthentication.UserNamePasswordValidationMode;
 
 			// Windows
-			sb.WindowsAuthentication.AllowAnonymousLogons = WindowsAuthentication.AllowAnonymousLogons;
-			sb.WindowsAuthentication.IncludeWindowsGroups = WindowsAuthentication.IncludeWindowsGroups;
+			behavior.WindowsAuthentication.AllowAnonymousLogons = WindowsAuthentication.AllowAnonymousLogons;
+			behavior.WindowsAuthentication.IncludeWindowsGroups = WindowsAuthentication.IncludeWindowsGroups;
 		}
 
 		X509Certificate2 GetCertificate (StoreLocation storeLocation, StoreName storeName, X509FindType findType, object findValue)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs
index 6de08d8d901..4dfa45e011d 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/ServiceModelConfigurationElementCollection.cs
@@ -94,19 +94,19 @@ namespace System.ServiceModel.Configuration
 			return (ConfigurationElement) Activator.CreateInstance (typeof (ConfigurationElementType), new object [0]);
 		}
 
-		public void CopyTo (ConfigurationElementType [] array, int index)
+		public void CopyTo (ConfigurationElementType [] array, int start)
 		{
-			base.CopyTo (array, index);
+			base.CopyTo (array, start);
 		}
 
-		public int IndexOf (ConfigurationElementType item)
+		public int IndexOf (ConfigurationElementType element)
 		{
-			return BaseIndexOf (item);
+			return BaseIndexOf (element);
 		}
 
-		public void Remove (ConfigurationElementType item)
+		public void Remove (ConfigurationElementType element)
 		{
-			BaseRemove (GetElementKey (item));
+			BaseRemove (GetElementKey (element));
 		}
 
 		public void RemoveAt (int index)
@@ -114,9 +114,9 @@ namespace System.ServiceModel.Configuration
 			BaseRemoveAt (index);
 		}
 
-		public void RemoveAt (object index)
+		public void RemoveAt (object key)
 		{
-			BaseRemove (index);
+			BaseRemove (key);
 		}
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs
index 45b4b753ba6..a2bf4f649e8 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingOptionalReliableSessionElement.cs
@@ -92,10 +92,10 @@ namespace System.ServiceModel.Configuration
 
 		// Methods
 
-		public void ApplyConfiguration (OptionalReliableSession s)
+		public void ApplyConfiguration (OptionalReliableSession optionalReliableSession)
 		{
-			base.ApplyConfiguration (s);
-			s.Enabled = this.Enabled;
+			base.ApplyConfiguration (optionalReliableSession);
+			optionalReliableSession.Enabled = this.Enabled;
 		}
 	}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs
index 08d4aaa59a5..6a06b7375b6 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardBindingReliableSessionElement.cs
@@ -115,10 +115,10 @@ namespace System.ServiceModel.Configuration
 
 		// Methods
 
-		public void ApplyConfiguration (ReliableSession s)
+		public void ApplyConfiguration (ReliableSession reliableSession)
 		{
-			s.InactivityTimeout = InactivityTimeout;
-			s.Ordered = Ordered;
+			reliableSession.InactivityTimeout = InactivityTimeout;
+			reliableSession.Ordered = Ordered;
 		}
 	}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs
index 559481da6b7..fe3a6ff1152 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointElement.cs
@@ -114,11 +114,11 @@ namespace System.ServiceModel.Configuration
 
 		protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ChannelEndpointElement channelEndpointElement);
 
-		protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement channelEndpointElement);
+		protected abstract void OnApplyConfiguration (ServiceEndpoint endpoint, ServiceEndpointElement serviceEndpointElement);
 
 		protected abstract void OnInitializeAndValidate (ChannelEndpointElement channelEndpointElement);
 
-		protected abstract void OnInitializeAndValidate (ServiceEndpointElement channelEndpointElement);
+		protected abstract void OnInitializeAndValidate (ServiceEndpointElement serviceEndpointElement);
 
 		protected override void Reset (ConfigurationElement parentElement)
 		{
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs
index 2a82a49ac5f..aa38ecda1a5 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/StandardEndpointsSection.cs
@@ -109,12 +109,12 @@ namespace System.ServiceModel.Configuration
 			return sm.StandardEndpoints;
 		}
 
-		public new EndpointCollectionElement this [string name] {
+		public new EndpointCollectionElement this [string endpoint] {
 			get {
-				object element = base [name];
+				object element = base [endpoint];
 				if (element is EndpointCollectionElement)
 					return (EndpointCollectionElement) element;
-				throw new ArgumentException (String.Format ("Could not find {0}", name));
+				throw new ArgumentException (String.Format ("Could not find {0}", endpoint));
 			}
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs
index 56cfdc76f56..2aa626e6186 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Configuration/TextMessageEncodingElement.cs
@@ -124,9 +124,9 @@ namespace System.ServiceModel.Configuration
 		}
 
 
-		public override void ApplyConfiguration (BindingElement element)
+		public override void ApplyConfiguration (BindingElement bindingElement)
 		{
-			var b = (TextMessageEncodingBindingElement) element;
+			var b = (TextMessageEncodingBindingElement) bindingElement;
 			b.MaxReadPoolSize = MaxReadPoolSize;
 			b.MaxWritePoolSize = MaxWritePoolSize;
 			b.MessageVersion = MessageVersion;
@@ -135,9 +135,9 @@ namespace System.ServiceModel.Configuration
 			ReaderQuotas.ApplyConfiguration (b.ReaderQuotas);
 		}
 
-		public override void CopyFrom (ServiceModelExtensionElement element)
+		public override void CopyFrom (ServiceModelExtensionElement from)
 		{
-			var b = (TextMessageEncodingElement) element;
+			var b = (TextMessageEncodingElement) from;
 			MaxReadPoolSize = b.MaxReadPoolSize;
 			MaxWritePoolSize = b.MaxWritePoolSize;
 			MessageVersion = b.MessageVersion;
@@ -146,9 +146,9 @@ namespace System.ServiceModel.Configuration
 			ReaderQuotas.CopyFrom (b.ReaderQuotas);
 		}
 
-		protected internal override void InitializeFrom (BindingElement element)
+		protected internal override void InitializeFrom (BindingElement bindingElement)
 		{
-			var b = (TextMessageEncodingBindingElement) element;
+			var b = (TextMessageEncodingBindingElement) bindingElement;
 			MaxReadPoolSize = b.MaxReadPoolSize;
 			MaxWritePoolSize = b.MaxWritePoolSize;
 			MessageVersion = b.MessageVersion;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs
index b77c331a401..11f9991a60f 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/FaultDescriptionCollection.cs
@@ -40,20 +40,20 @@ namespace System.ServiceModel.Description
 		{
 		}
 
-		public FaultDescription Find (string name)
+		public FaultDescription Find (string action)
 		{
 			foreach (FaultDescription d in this)
-				if (d.Name == name)
+				if (d.Name == action)
 					return d;
 			return null;
 		}
 
-		public Collection<FaultDescription> FindAll (string name)
+		public Collection<FaultDescription> FindAll (string action)
 		{
 			Collection<FaultDescription> ret =
 				new Collection<FaultDescription> ();
 			foreach (FaultDescription d in this)
-				if (d.Name == name)
+				if (d.Name == action)
 					ret.Add (d);
 			return ret;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs
index 39103884b40..fb16e0a9a48 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IServiceBehavior.cs
@@ -35,17 +35,17 @@ namespace System.ServiceModel.Description
 	public interface IServiceBehavior
 	{
 		void AddBindingParameters (
-			ServiceDescription description,
+			ServiceDescription serviceDescription,
 			ServiceHostBase serviceHostBase,
 			Collection<ServiceEndpoint> endpoints,
-			BindingParameterCollection parameters);
+			BindingParameterCollection bindingParameters);
 
 		void ApplyDispatchBehavior (
-			ServiceDescription description,
+			ServiceDescription serviceDescription,
 			ServiceHostBase serviceHostBase);
 
 		void Validate (
-			ServiceDescription description,
+			ServiceDescription serviceDescription,
 			ServiceHostBase serviceHostBase);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs
index 31374445b0b..07a26129c50 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/IWsdlImporter.cs
@@ -41,9 +41,9 @@ namespace System.ServiceModel.Description
 			XmlSchemaSet xmlSchemas, ICollection<XmlElement> policy);
 
 		void ImportContract (WsdlImporter importer,
-			WsdlContractConversionContext contractContext);
+			WsdlContractConversionContext context);
 
 		void ImportEndpoint (WsdlImporter importer,
-			WsdlEndpointConversionContext endpointContext);
+			WsdlEndpointConversionContext context);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs
index afa66b94294..91388a15594 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/MetadataConversionError.cs
@@ -57,9 +57,9 @@ namespace System.ServiceModel.Description
 			get { return msg; }
 		}
 
-		public override bool Equals (object other)
+		public override bool Equals (object obj)
 		{
-			MetadataConversionError e = other as MetadataConversionError;
+			MetadataConversionError e = obj as MetadataConversionError;
 			return e != null &&
 				e.warning == warning &&
 				e.msg == msg;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs
index 274a2be62be..018250f4b9e 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/OperationContractGenerationContext.cs
@@ -53,7 +53,7 @@ namespace System.ServiceModel.Description
 			ServiceContractGenerationContext contract,
 			OperationDescription operation,
 			CodeTypeDeclaration declaringType,
-			CodeMemberMethod method,
+			CodeMemberMethod syncMethod,
 			CodeMemberMethod beginMethod,
 			CodeMemberMethod endMethod)
 		{
@@ -61,7 +61,7 @@ namespace System.ServiceModel.Description
 			this.contract = contract;
 			this.operation = operation;
 			declaring_type = declaringType;
-			this.method = method;
+			this.method = syncMethod;
 			this.begin_method = beginMethod;
 			this.end_method = endMethod;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs
index 60d03dc17c7..3fb7105f046 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/PolicyAssertionCollection.cs
@@ -41,45 +41,45 @@ namespace System.ServiceModel.Description
 		{
 		}
 
-		public PolicyAssertionCollection (IEnumerable<XmlElement> list)
-			: base (new List<XmlElement> (list))
+		public PolicyAssertionCollection (IEnumerable<XmlElement> elements)
+			: base (new List<XmlElement> (elements))
 		{
 		}
 
 		[MonoTODO]
-		public bool Contains (string name, string ns)
+		public bool Contains (string localName, string namespaceUri)
 		{
 			foreach (XmlElement el in this)
-				if (el.LocalName == name && el.NamespaceURI == ns)
+				if (el.LocalName == localName && el.NamespaceURI == namespaceUri)
 					return true;
 			return false;
 		}
 
 		[MonoTODO]
-		public XmlElement Find (string name, string ns)
+		public XmlElement Find (string localName, string namespaceUri)
 		{
 			foreach (XmlElement el in this)
-				if (el.LocalName == name && el.NamespaceURI == ns)
+				if (el.LocalName == localName && el.NamespaceURI == namespaceUri)
 					return el;
 			return null;
 		}
 
 		[MonoTODO]
-		public Collection<XmlElement> FindAll (string name, string ns)
+		public Collection<XmlElement> FindAll (string localName, string namespaceUri)
 		{
 			Collection<XmlElement> ret =
 				new Collection<XmlElement> ();
 			foreach (XmlElement el in this)
-				if (el.LocalName == name && el.NamespaceURI == ns)
+				if (el.LocalName == localName && el.NamespaceURI == namespaceUri)
 					ret.Add (el);
 			return ret;
 		}
 
 		[MonoTODO]
-		public XmlElement Remove (string name, string ns)
+		public XmlElement Remove (string localName, string namespaceUri)
 		{
 			foreach (XmlElement el in this)
-				if (el.LocalName == name && el.NamespaceURI == ns) {
+				if (el.LocalName == localName && el.NamespaceURI == namespaceUri) {
 					Remove (el);
 					return el;
 				}
@@ -87,9 +87,9 @@ namespace System.ServiceModel.Description
 		}
 
 		[MonoTODO]
-		public Collection<XmlElement> RemoveAll (string name, string ns)
+		public Collection<XmlElement> RemoveAll (string localName, string namespaceUri)
 		{
-			Collection<XmlElement> list = FindAll (name, ns);
+			Collection<XmlElement> list = FindAll (localName, namespaceUri);
 			foreach (XmlElement el in list)
 				Remove (el);
 			return list;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs
index 59f0aa2ce7f..8590c4538c5 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceContractGenerator.cs
@@ -111,23 +111,23 @@ namespace System.ServiceModel.Description
 		{
 		}
 
-		public ServiceContractGenerator (CodeCompileUnit ccu)
-			: this (ccu, null)
+		public ServiceContractGenerator (CodeCompileUnit targetCompileUnit)
+			: this (targetCompileUnit, null)
 		{
 		}
 
-		public ServiceContractGenerator (ConfigurationType config)
-			: this (null, config)
+		public ServiceContractGenerator (ConfigurationType targetConfig)
+			: this (null, targetConfig)
 		{
 		}
 
-		public ServiceContractGenerator (CodeCompileUnit ccu, ConfigurationType config)
+		public ServiceContractGenerator (CodeCompileUnit targetCompileUnit, ConfigurationType targetConfig)
 		{
-			if (ccu == null)
+			if (targetCompileUnit == null)
 				this.ccu = new CodeCompileUnit ();
 			else
-				this.ccu = ccu;
-			this.config = config;
+				this.ccu = targetCompileUnit;
+			this.config = targetConfig;
 			Options |= ServiceContractGenerationOptions.ChannelInterface | 
 				ServiceContractGenerationOptions.ClientClass;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs
index 4235e393b8a..5b6caccb2c2 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceDescription.cs
@@ -81,30 +81,30 @@ namespace System.ServiceModel.Description
 			set { service_type = value; }
 		}
 
-		public static ServiceDescription GetService (Type type)
+		public static ServiceDescription GetService (Type serviceType)
 		{
 			// null Type is not rejected
 			ServiceDescription sd = new ServiceDescription ();
-			sd.ServiceType = type;
-			if (type != null) {
-				var att = type.GetCustomAttribute<ServiceBehaviorAttribute> (true);
+			sd.ServiceType = serviceType;
+			if (serviceType != null) {
+				var att = serviceType.GetCustomAttribute<ServiceBehaviorAttribute> (true);
 				if (att != null) {
 					sd.Name = att.Name;
 					sd.Namespace = att.Namespace;
 				}
 				if (sd.Name == null)
-					sd.Name = type.Name;
+					sd.Name = serviceType.Name;
 				if (sd.Namespace == null)
 					sd.Namespace = "http://tempuri.org/";
 			}
 			return sd;
 		}
 
-		public static ServiceDescription GetService (object wellKnown)
+		public static ServiceDescription GetService (object serviceImplementation)
 		{
 			// null instance is not rejected
 			ServiceDescription sd = new ServiceDescription ();
-			sd.ServiceType = wellKnown != null ? wellKnown.GetType () : null;
+			sd.ServiceType = serviceImplementation != null ? serviceImplementation.GetType () : null;
 			return sd;
 		}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs
index 191d411ed41..6641e62b4da 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/ServiceEndpointCollection.cs
@@ -38,27 +38,27 @@ namespace System.ServiceModel.Description
 		{
 		}
 
-		public ServiceEndpoint Find (Type type)
+		public ServiceEndpoint Find (Type contractType)
 		{
 			foreach (ServiceEndpoint e in this)
-				if (e.Contract.ContractType == type)
+				if (e.Contract.ContractType == contractType)
 					return e;
 			return null;
 		}
 
-		public ServiceEndpoint Find (Uri uri)
+		public ServiceEndpoint Find (Uri address)
 		{
 			foreach (ServiceEndpoint e in this)
-				if (e.Address.Uri == uri)
+				if (e.Address.Uri == address)
 					return e;
 			return null;
 		}
 
-		public ServiceEndpoint Find (XmlQualifiedName name)
+		public ServiceEndpoint Find (XmlQualifiedName contractName)
 		{
 			foreach (ServiceEndpoint e in this)
-				if (e.Contract.Name == name.Name &&
-					e.Contract.Namespace == name.Namespace)
+				if (e.Contract.Name == contractName.Name &&
+					e.Contract.Namespace == contractName.Namespace)
 					return e;
 			return null;
 		}
@@ -96,13 +96,13 @@ namespace System.ServiceModel.Description
 			return list;
 		}
 
-		public Collection<ServiceEndpoint> FindAll (XmlQualifiedName name)
+		public Collection<ServiceEndpoint> FindAll (XmlQualifiedName contractName)
 		{
 			Collection<ServiceEndpoint> list =
 				new Collection<ServiceEndpoint> ();
 			foreach (ServiceEndpoint e in this)
-				if (e.Contract.Name == name.Name &&
-				    e.Contract.Namespace == name.Namespace)
+				if (e.Contract.Name == contractName.Name &&
+				    e.Contract.Namespace == contractName.Namespace)
 					list.Add (e);
 			return list;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs
index 153f3713d2e..aff8033dacd 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/TypedMessageConverter.cs
@@ -73,50 +73,50 @@ namespace System.ServiceModel.Description
 		}
 
 		public static TypedMessageConverter Create (
-			Type type, string action)
+			Type messageContract, string action)
 		{
-			return Create (type, action, TempUri);
+			return Create (messageContract, action, TempUri);
 		}
 
 		public static TypedMessageConverter Create (
-			Type type, string action,
+			Type messageContract, string action,
 			string defaultNamespace)
 		{
-			return Create (type, action, defaultNamespace, (DataContractFormatAttribute)null);
+			return Create (messageContract, action, defaultNamespace, (DataContractFormatAttribute)null);
 		}
 
 		public static TypedMessageConverter Create (
-			Type type, string action,
+			Type messageContract, string action,
 			DataContractFormatAttribute formatterAttribute)
 		{
-			return Create (type, action, TempUri, formatterAttribute);
+			return Create (messageContract, action, TempUri, formatterAttribute);
 		}
 
 		public static TypedMessageConverter Create (
-			Type type,
+			Type messageContract,
 			string action, string defaultNamespace,
 			DataContractFormatAttribute formatterAttribute)
 		{
 			return new DefaultTypedMessageConverter (
 				new DataContractMessagesFormatter (
-					MessageContractToMessagesDescription (type, defaultNamespace, action),
+					MessageContractToMessagesDescription (messageContract, defaultNamespace, action),
 					formatterAttribute));
 		}
 
 		public static TypedMessageConverter Create (
-			Type type, string action,
+			Type messageContract, string action,
 			XmlSerializerFormatAttribute formatterAttribute)
 		{
-			return Create (type, action, TempUri, formatterAttribute);
+			return Create (messageContract, action, TempUri, formatterAttribute);
 		}
 
 		public static TypedMessageConverter Create (
-			Type type, string action, string defaultNamespace,
+			Type messageContract, string action, string defaultNamespace,
 			XmlSerializerFormatAttribute formatterAttribute)
 		{
 			return new DefaultTypedMessageConverter (
 				new XmlMessagesFormatter (
-					MessageContractToMessagesDescription (type, defaultNamespace, action),
+					MessageContractToMessagesDescription (messageContract, defaultNamespace, action),
 					formatterAttribute));
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs
index da253dd1e95..b604d64c8ec 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlEndpointConversionContext.cs
@@ -76,7 +76,7 @@ namespace System.ServiceModel.Description
 		}
 
 		public MessageDescription GetMessageDescription (
-			MessageBinding message)
+			MessageBinding messageBinding)
 		{
 			throw new NotImplementedException ();
 		}
@@ -88,7 +88,7 @@ namespace System.ServiceModel.Description
 		}
 
 		public OperationDescription GetOperationDescription (
-			OperationBinding operation)
+			OperationBinding operationBinding)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs
index be5e051ff47..a1ceff80101 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlExporter.cs
@@ -441,12 +441,12 @@ namespace System.ServiceModel.Description
 
 		public void ExportEndpoints (
 			IEnumerable<ServiceEndpoint> endpoints,
-			XmlQualifiedName name)
+			XmlQualifiedName wsdlServiceQName)
 		{
 			if (endpoints == null)
 				throw new ArgumentNullException ("endpoints");
-			if (name == null)
-				throw new ArgumentNullException ("name");
+			if (wsdlServiceQName == null)
+				throw new ArgumentNullException ("wsdlServiceQName");
 
 			foreach (ServiceEndpoint ep in endpoints) {
 				if (ep.Contract.Name == ServiceMetadataBehavior.MexContractName)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs
index 562e02b25d4..dd95be31d54 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/WsdlImporter.cs
@@ -153,9 +153,9 @@ namespace System.ServiceModel.Description
 			beforeImportCalled = true;
 		}
 
-		public SMBinding ImportBinding (WSBinding binding)
+		public SMBinding ImportBinding (WSBinding wsdlBinding)
 		{
-			return ImportBinding (binding, true).Binding;
+			return ImportBinding (wsdlBinding, true).Binding;
 		}
 
 		ServiceEndpoint ImportBinding (WSBinding binding, bool throwOnError)
@@ -546,20 +546,20 @@ namespace System.ServiceModel.Description
 			}
 		}
 
-		public ServiceEndpointCollection ImportEndpoints (WSBinding binding)
+		public ServiceEndpointCollection ImportEndpoints (WSBinding wsdlBinding)
 		{
 			var coll = new ServiceEndpointCollection ();
-			ImportEndpoints (coll, binding);
+			ImportEndpoints (coll, wsdlBinding);
 			return coll;
 		}
 
-		public ServiceEndpointCollection ImportEndpoints (PortType portType)
+		public ServiceEndpointCollection ImportEndpoints (PortType wsdlPortType)
 		{
 			var coll = new ServiceEndpointCollection ();
 
 			foreach (WSServiceDescription wsd in wsdl_documents) {
 				foreach (WS.Binding binding in wsd.Bindings) {
-					if (!binding.Type.Name.Equals (portType.Name))
+					if (!binding.Type.Name.Equals (wsdlPortType.Name))
 						continue;
 
 					ImportEndpoints (coll, binding);
@@ -569,11 +569,11 @@ namespace System.ServiceModel.Description
 			return coll;
 		}
 
-		public ServiceEndpointCollection ImportEndpoints (Service service)
+		public ServiceEndpointCollection ImportEndpoints (Service wsdlService)
 		{
 			var coll = new ServiceEndpointCollection ();
 			
-			foreach (Port port in service.Ports) {
+			foreach (Port port in wsdlService.Ports) {
 				var sep = ImportEndpoint (port, false);
 				if (sep != null)
 					coll.Add (sep);
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs
index 26ee9d753d8..6a43f3510e9 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Description/XmlSerializerOperationBehavior.cs
@@ -51,13 +51,13 @@ namespace System.ServiceModel.Description
 
 		public XmlSerializerOperationBehavior (
 			OperationDescription operation,
-			XmlSerializerFormatAttribute format)
+			XmlSerializerFormatAttribute attribute)
 		{
 			if (operation == null)
 				throw new ArgumentNullException ("operation");
-			if (format == null)
-				format = new XmlSerializerFormatAttribute ();
-			this.format = format;
+			if (attribute == null)
+				attribute = new XmlSerializerFormatAttribute ();
+			this.format = attribute;
 			this.operation = operation;
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs
index 07ecb269b3a..71439523674 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ActionMessageFilter.cs
@@ -70,10 +70,10 @@ namespace System.ServiceModel.Dispatcher {
 			return false;
 		}
 
-		public override bool Match (MessageBuffer buffer)
+		public override bool Match (MessageBuffer messageBuffer)
 		{
 			bool retval;
-			Message m = buffer.CreateMessage ();
+			Message m = messageBuffer.CreateMessage ();
 			retval = Match (m);
 			m.Close ();
 			
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs
index ed5cdd8428e..72133244bab 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/ExceptionHandler.cs
@@ -65,6 +65,6 @@ namespace System.ServiceModel.Dispatcher {
 			set { transport_handler = value; }
 		}
 
-		public abstract bool HandleException (Exception e);
+		public abstract bool HandleException (Exception exception);
 	}
 }
\ No newline at end of file
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs
index faa7b6c0773..9479897fb0c 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/FilterInvalidBodyAccessException.cs
@@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher
 		Collection<MessageFilter> filters;
 
 		public FilterInvalidBodyAccessException () : base ("Not allowed to navigate to body.") {}
-		public FilterInvalidBodyAccessException (string msg) : base (msg) {}
-		public FilterInvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {}		
+		public FilterInvalidBodyAccessException (string message) : base (message) {}
+		public FilterInvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {}		
 		protected FilterInvalidBodyAccessException (SerializationInfo info, StreamingContext context)
 			: base (info, context) {}
 
-		public FilterInvalidBodyAccessException (string msg, Collection<MessageFilter> filters)
-			: base (msg)
+		public FilterInvalidBodyAccessException (string message, Collection<MessageFilter> filters)
+			: base (message)
 		{
 			this.filters = filters;
 		}
 
-		public FilterInvalidBodyAccessException (string msg, Exception inner, Collection<MessageFilter> filters)
-			: base (msg, inner)
+		public FilterInvalidBodyAccessException (string message, Exception innerException, Collection<MessageFilter> filters)
+			: base (message, innerException)
 		{
 			this.filters = filters;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs
index ca367777b14..b00e94f0428 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageFormatter.cs
@@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher
 	public interface IDispatchMessageFormatter
 	{
 		void DeserializeRequest (Message message, object [] parameters);
-		Message SerializeReply (MessageVersion version, object [] parameters, object result);
+		Message SerializeReply (MessageVersion messageVersion, object [] parameters, object result);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs
index b9c278cf084..a8fcaac45ef 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchMessageInspector.cs
@@ -32,8 +32,8 @@ namespace System.ServiceModel.Dispatcher
 {
 	public interface IDispatchMessageInspector
 	{
-		object AfterReceiveRequest (ref Message message,
-			IClientChannel channel, InstanceContext context);
-		void BeforeSendReply (ref Message message, object instance);
+		object AfterReceiveRequest (ref Message request,
+			IClientChannel channel, InstanceContext instanceContext);
+		void BeforeSendReply (ref Message reply, object correlationState);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs
index 04441f07955..49357ef5686 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IDispatchOperationSelector.cs
@@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher
 {
 	public interface IDispatchOperationSelector
 	{
-		string SelectOperation (ref Message msg);
+		string SelectOperation (ref Message message);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs
index f9b2f101b16..9f5e99a6092 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IErrorHandler.cs
@@ -31,8 +31,8 @@ namespace System.ServiceModel.Dispatcher
 {
 	public interface IErrorHandler
 	{
-		bool HandleError (Exception exception);
-		void ProvideFault (Exception exception, MessageVersion version,
+		bool HandleError (Exception error);
+		void ProvideFault (Exception error, MessageVersion version,
 			ref Message fault);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs
index d3887da8779..3d26c75c097 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceContextInitializer.cs
@@ -32,6 +32,6 @@ namespace System.ServiceModel.Dispatcher
 {
 	public interface IInstanceContextInitializer
 	{
-		void Initialize (InstanceContext context, Message message);
+		void Initialize (InstanceContext instanceContext, Message message);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs
index eb939268272..22ba41ccfbc 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IInstanceProvider.cs
@@ -31,8 +31,8 @@ namespace System.ServiceModel.Dispatcher
 {
 	public interface IInstanceProvider
 	{
-		object GetInstance (InstanceContext context);
-		object GetInstance (InstanceContext context, Message message);
-		void ReleaseInstance (InstanceContext context, object instance);
+		object GetInstance (InstanceContext instanceContext);
+		object GetInstance (InstanceContext instanceContext, Message message);
+		void ReleaseInstance (InstanceContext instanceContext, object instance);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs
index 5e185ac55b3..6e5967ab658 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/IMessageFilterTable.cs
@@ -40,16 +40,16 @@ namespace System.ServiceModel.Dispatcher
 		  IEnumerable<KeyValuePair<MessageFilter,TFilterData>>,
 		  IEnumerable
 	{
-		bool GetMatchingFilter (Message message, out MessageFilter result);
-		bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result);
+		bool GetMatchingFilter (Message message, out MessageFilter filter);
+		bool GetMatchingFilter (MessageBuffer messageBuffer, out MessageFilter filter);
 
 		bool GetMatchingFilters (Message message, ICollection<MessageFilter> results);
-		bool GetMatchingFilters (MessageBuffer buffer, ICollection<MessageFilter> results);
+		bool GetMatchingFilters (MessageBuffer messageBuffer, ICollection<MessageFilter> results);
 
-		bool GetMatchingValue (Message message, out TFilterData data);
-		bool GetMatchingValue (MessageBuffer buffer, out TFilterData data);
+		bool GetMatchingValue (Message message, out TFilterData value);
+		bool GetMatchingValue (MessageBuffer messageBuffer, out TFilterData value);
 
 		bool GetMatchingValues (Message message, ICollection<TFilterData> results);
-		bool GetMatchingValues (MessageBuffer buffer, ICollection<TFilterData> results);
+		bool GetMatchingValues (MessageBuffer messageBuffer, ICollection<TFilterData> results);
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs
index 9d46d2743b9..ad6a5194a1b 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InstanceContextIdleCallback.cs
@@ -1,4 +1,4 @@
-//
+//
 // InstanceContextIdleCallback.cs
 //
 // Author: Atsushi Enomoto (atsushi@ximian.com)
@@ -28,5 +28,5 @@ using System;
 
 namespace System.ServiceModel.Dispatcher
 {
-	public delegate void InstanceContextIdleCallback (InstanceContext context);
+	public delegate void InstanceContextIdleCallback (InstanceContext instanceContext);
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs
index 2c34c3cd679..7474906c6d0 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/InvalidBodyAccessException.cs
@@ -34,8 +34,8 @@ namespace System.ServiceModel.Dispatcher
 	[Serializable]
 	public abstract class InvalidBodyAccessException : SystemException
 	{
-		protected InvalidBodyAccessException (string msg) : base (msg) {}
-		protected InvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {}
+		protected InvalidBodyAccessException (string message) : base (message) {}
+		protected InvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {}
 		protected InvalidBodyAccessException (SerializationInfo info, StreamingContext context)
 			: base (info, context) {}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs
index 4f0aa6be5ea..5b9de5e2f4a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchAllMessageFilter.cs
@@ -44,7 +44,7 @@ namespace System.ServiceModel.Dispatcher
 			return true; 
 		}
 
-		public override bool Match (MessageBuffer buffer)
+		public override bool Match (MessageBuffer messageBuffer)
 		{
 			// as documented
 			return true; 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs
index 32721443858..d0fe3aef867 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MatchNoneMessageFilter.cs
@@ -44,7 +44,7 @@ namespace System.ServiceModel.Dispatcher
 			return false; 
 		}
 
-		public override bool Match (MessageBuffer buffer)
+		public override bool Match (MessageBuffer messageBuffer)
 		{
 			// as documented
 			return false; 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs
index 50b526a913e..5801ca38919 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterNodeQuotaExceededException.cs
@@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher
 		Collection<MessageFilter> filters;
 
 		public MessageFilterException () : this ("MessageFilter node quota exceeded.") {}
-		public MessageFilterException (string msg) : base (msg) {}
-		public MessageFilterException (string msg, Exception inner) : base (msg, inner) {}		
+		public MessageFilterException (string message) : base (message) {}
+		public MessageFilterException (string message, Exception innerException) : base (message, innerException) {}		
 		protected MessageFilterException (SerializationInfo info, StreamingContext context)
 			: base (info, context) {}
 
-		public MessageFilterException (string msg, Collection<MessageFilter> filters)
-			: base (msg)
+		public MessageFilterException (string message, Collection<MessageFilter> filters)
+			: base (message)
 		{
 			this.filters = filters;
 		}
 
-		public MessageFilterException (string msg, Exception inner, Collection<MessageFilter> filters)
-			: base (msg, inner)
+		public MessageFilterException (string message, Exception innerException, Collection<MessageFilter> filters)
+			: base (message, innerException)
 		{
 			this.filters = filters;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs
index b0f40213002..e93fb8be4f9 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MessageFilterTable.cs
@@ -46,9 +46,9 @@ namespace System.ServiceModel.Dispatcher
 		public MessageFilterTable ()
 			: this (0) {} // 0 is the default
 
-		public MessageFilterTable (int default_priority)
+		public MessageFilterTable (int defaultPriority)
 		{
-			this.default_priority = default_priority;
+			this.default_priority = defaultPriority;
 			table = new Dictionary<MessageFilter, TFilterData> ();
 			priority_list = new Dictionary<MessageFilter, int> ();
 		}
@@ -85,9 +85,9 @@ namespace System.ServiceModel.Dispatcher
 			return table.ContainsKey (filter);
 		}
 
-		public void CopyTo (KeyValuePair<MessageFilter, TFilterData> [] array, int index)
+		public void CopyTo (KeyValuePair<MessageFilter, TFilterData> [] array, int arrayIndex)
 		{
-			((ICollection) table).CopyTo (array, index);
+			((ICollection) table).CopyTo (array, arrayIndex);
 		}
 
 		protected virtual IMessageFilterTable<TFilterData> CreateFilterTable (MessageFilter filter)
@@ -105,11 +105,11 @@ namespace System.ServiceModel.Dispatcher
 			return priority_list [filter];
 		}
 
-		public bool GetMatchingFilter (Message message, out MessageFilter result)
+		public bool GetMatchingFilter (Message message, out MessageFilter filter)
 		{
 			if (message == null)
 				throw new ArgumentNullException ("message is null");
-			result = null;
+			filter = null;
 
 			int count = 0;
 			foreach (MessageFilter f in table.Keys) {
@@ -121,14 +121,14 @@ namespace System.ServiceModel.Dispatcher
 					    "More than one filter matches.");
 
 				count++;
-				result = f;
+				filter = f;
 			}
 			return count == 1;
 		}
 
-		public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result)
+		public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter filter)
 		{
-			return GetMatchingFilter (buffer.CreateMessage (), out result);
+			return GetMatchingFilter (buffer.CreateMessage (), out filter);
 		}
 
 		[MonoTODO ("Consider priority")]		
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs
index b33c0fdca29..9f8caadeb9b 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/MultipleMessageFilterMatchesException.cs
@@ -38,19 +38,19 @@ namespace System.ServiceModel.Dispatcher
 		Collection<MessageFilter> filters;
 
 		public MultipleFilterMatchesException () : base () {}
-		public MultipleFilterMatchesException (string msg) : base (msg) {}
-		public MultipleFilterMatchesException (string msg, Exception inner) : base (msg, inner) {}		
+		public MultipleFilterMatchesException (string message) : base (message) {}
+		public MultipleFilterMatchesException (string message, Exception innerException) : base (message, innerException) {}		
 		protected MultipleFilterMatchesException (SerializationInfo info, StreamingContext context)
 			: base (info, context) {}
 
-		public MultipleFilterMatchesException (string msg, Collection<MessageFilter> filters)
-			: base (msg)
+		public MultipleFilterMatchesException (string message, Collection<MessageFilter> filters)
+			: base (message)
 		{
 			this.filters = filters;
 		}
 
-		public MultipleFilterMatchesException (string msg, Exception inner, Collection<MessageFilter> filters)
-			: base (msg, inner)
+		public MultipleFilterMatchesException (string message, Exception innerException, Collection<MessageFilter> filters)
+			: base (message, innerException)
 		{
 			this.filters = filters;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs
index 08d3b19f6ba..595110a87c2 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/NavigatorInvalidBodyAccessException.cs
@@ -35,8 +35,8 @@ namespace System.ServiceModel.Dispatcher
 	public class NavigatorInvalidBodyAccessException : InvalidBodyAccessException
 	{
 		public NavigatorInvalidBodyAccessException () : base ("Not allowed to navigate to body.") {}
-		public NavigatorInvalidBodyAccessException (string msg) : base (msg) {}
-		public NavigatorInvalidBodyAccessException (string msg, Exception inner) : base (msg, inner) {}
+		public NavigatorInvalidBodyAccessException (string message) : base (message) {}
+		public NavigatorInvalidBodyAccessException (string message, Exception innerException) : base (message, innerException) {}
 		protected NavigatorInvalidBodyAccessException (SerializationInfo info, StreamingContext context)
 			: base (info, context) {}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs
index cac0bf91116..a4f8f2c721a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/SeekableXPathNavigator.cs
@@ -36,12 +36,12 @@ namespace System.ServiceModel.Dispatcher
 	{
 		protected SeekableXPathNavigator () {}
 
-		public abstract XmlNodeOrder ComparePosition (long first, long second);
-		public abstract string GetLocalName (long node_position);
-		public abstract string GetName (long node_position);
-		public abstract string GetNamespace (long node_position);
-		public abstract XPathNodeType GetNodeType (long node_position);
-		public abstract string GetValue (long node_position);
+		public abstract XmlNodeOrder ComparePosition (long firstPosition, long secondPosition);
+		public abstract string GetLocalName (long nodePosition);
+		public abstract string GetName (long nodePosition);
+		public abstract string GetNamespace (long nodePosition);
+		public abstract XPathNodeType GetNodeType (long nodePosition);
+		public abstract string GetValue (long nodePosition);
 
 		public abstract long CurrentPosition { get; set; }
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs
index 3bef60dc7cf..302facfca81 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageContext.cs
@@ -41,8 +41,8 @@ namespace System.ServiceModel.Dispatcher
 		{
 		}
 
-		public XPathMessageContext (NameTable nameTable)
-			: base (nameTable)
+		public XPathMessageContext (NameTable table)
+			: base (table)
 		{
 			AddNamespace ("s11", Constants.Soap11);
 			AddNamespace ("s12", Constants.Soap12);
@@ -52,9 +52,9 @@ namespace System.ServiceModel.Dispatcher
 			get { return false; } // as documented.
 		}
 
-		public override int CompareDocument (string uri1, string uri2)
+		public override int CompareDocument (string baseUri, string nextBaseUri)
 		{
-			return String.CompareOrdinal (uri1, uri2);
+			return String.CompareOrdinal (baseUri, nextBaseUri);
 		}
 
 		public override bool PreserveWhitespace (XPathNavigator node)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs
index 17a612b62a1..658a5d1ed05 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilter.cs
@@ -68,9 +68,9 @@ namespace System.ServiceModel.Dispatcher
 			Initialize (xpath, namespaces);
 		}
 
-		public XPathMessageFilter (string xpath, XsltContext namespaces)
+		public XPathMessageFilter (string xpath, XsltContext context)
 		{
-			Initialize (xpath, namespaces);
+			Initialize (xpath, context);
 		}
 
 		[MonoTODO]
@@ -86,9 +86,9 @@ namespace System.ServiceModel.Dispatcher
 		}
 
 		[MonoTODO]
-		public XPathMessageFilter (XmlReader reader, XsltContext namespaces)
+		public XPathMessageFilter (XmlReader reader, XsltContext context)
 		{
-			Initialize (reader.ReadString (), namespaces);
+			Initialize (reader.ReadString (), context);
 		}
 
 		private void Initialize (string xpath, XmlNamespaceManager nsmgr)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs
index 71d7536fd34..f0c72f5de86 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathMessageFilterTable.cs
@@ -55,9 +55,9 @@ namespace System.ServiceModel.Dispatcher
 		{
 		}
 
-		public XPathMessageFilterTable (int quota)
+		public XPathMessageFilterTable (int capacity)
 		{
-			this.quota = quota;
+			this.quota = capacity;
 		}
 
 		[DataMember]
@@ -66,9 +66,9 @@ namespace System.ServiceModel.Dispatcher
 			set { quota = value; }
 		}
 
-		public TFilterData this [MessageFilter key] {
-			get { return dict [key]; }
-			set { dict [key] = value; }
+		public TFilterData this [MessageFilter filter] {
+			get { return dict [filter]; }
+			set { dict [filter] = value; }
 		}
 
 		public int Count {
@@ -114,17 +114,17 @@ namespace System.ServiceModel.Dispatcher
 				dict [item.Key].Equals (item.Value);
 		}
 
-		public bool ContainsKey (MessageFilter key)
+		public bool ContainsKey (MessageFilter filter)
 		{
-			return dict.ContainsKey (key);
+			return dict.ContainsKey (filter);
 		}
 
-		public void CopyTo (KeyValuePair<MessageFilter,TFilterData> [] array, int index)
+		public void CopyTo (KeyValuePair<MessageFilter,TFilterData> [] array, int arrayIndex)
 		{
-			if (index < 0 || dict.Count >= array.Length - index)
-				throw new ArgumentOutOfRangeException ("index");
+			if (arrayIndex < 0 || dict.Count >= array.Length - arrayIndex)
+				throw new ArgumentOutOfRangeException ("arrayIndex");
 			foreach (KeyValuePair<MessageFilter,TFilterData> item in dict)
-				array [index++] = item;
+				array [arrayIndex++] = item;
 		}
 
 		public IEnumerator<KeyValuePair<MessageFilter,TFilterData>> GetEnumerator ()
@@ -137,12 +137,12 @@ namespace System.ServiceModel.Dispatcher
 			return GetEnumerator ();
 		}
 
-		public bool GetMatchingFilter (Message message, out MessageFilter result)
+		public bool GetMatchingFilter (Message message, out MessageFilter filter)
 		{
 			throw new NotImplementedException ();
 		}
 
-		public bool GetMatchingFilter (MessageBuffer buffer, out MessageFilter result)
+		public bool GetMatchingFilter (MessageBuffer messageBuffer, out MessageFilter filter)
 		{
 			throw new NotImplementedException ();
 		}
@@ -162,7 +162,7 @@ namespace System.ServiceModel.Dispatcher
 			throw new NotImplementedException ();
 		}
 
-		public bool GetMatchingFilters (MessageBuffer buffer, ICollection<MessageFilter> results)
+		public bool GetMatchingFilters (MessageBuffer messageBuffer, ICollection<MessageFilter> results)
 		{
 			throw new NotImplementedException ();
 		}
@@ -182,7 +182,7 @@ namespace System.ServiceModel.Dispatcher
 			throw new NotImplementedException ();
 		}
 
-		public bool GetMatchingValue (MessageBuffer buffer, out TFilterData data)
+		public bool GetMatchingValue (MessageBuffer messageBuffer, out TFilterData data)
 		{
 			throw new NotImplementedException ();
 		}
@@ -202,7 +202,7 @@ namespace System.ServiceModel.Dispatcher
 			throw new NotImplementedException ();
 		}
 
-		public bool GetMatchingValues (MessageBuffer buffer, ICollection<TFilterData> results)
+		public bool GetMatchingValues (MessageBuffer messageBuffer, ICollection<TFilterData> results)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs
index 365a7be5bfe..b3cd66a6a3b 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Dispatcher/XPathNavigatorException.cs
@@ -36,9 +36,9 @@ namespace System.ServiceModel.Dispatcher
 	public class XPathNavigatorException : XPathException
 	{
 		public XPathNavigatorException () : this ("Navigator node quota exceeded") {}
-		public XPathNavigatorException (string msg) : base (msg) {}
-		public XPathNavigatorException (string msg, Exception inner)
-			: base (msg, inner) {}		
+		public XPathNavigatorException (string message) : base (message) {}
+		public XPathNavigatorException (string message, Exception innerException)
+			: base (message, innerException) {}		
 		protected XPathNavigatorException (SerializationInfo info,
 							    StreamingContext context)
 			: base (info, context) {}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs b/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs
index 654f8550330..a060cf0f5a8 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.PeerResolvers/UnregisterInfo.cs
@@ -29,10 +29,10 @@ namespace System.ServiceModel.PeerResolvers
 		{
 		}
 		
-		public UnregisterInfo (string meshId, Guid registration_id)
+		public UnregisterInfo (string meshId, Guid registrationId)
 		{
 			Body.MeshId = meshId;
-			Body.RegistrationId = registration_id;
+			Body.RegistrationId = registrationId;
 		}
 		
 		public string MeshId {
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs
index a865639e0b4..762e5876baf 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/IssuedSecurityTokenParameters.cs
@@ -61,17 +61,17 @@ namespace System.ServiceModel.Security.Tokens
 			binding = issuerBinding;
 		}
 
-		protected IssuedSecurityTokenParameters (IssuedSecurityTokenParameters source)
-			: base (source)
+		protected IssuedSecurityTokenParameters (IssuedSecurityTokenParameters other)
+			: base (other)
 		{
-			binding = source.binding;
-			issuer_address = source.issuer_address;
-			issuer_meta_address = source.issuer_meta_address;
-			key_size = source.key_size;
-			key_type = source.key_type;
-			token_type = source.token_type;
-			reqs = new Collection<ClaimTypeRequirement> (source.reqs);
-			additional_reqs = new Collection<XmlElement> (source.additional_reqs);
+			binding = other.binding;
+			issuer_address = other.issuer_address;
+			issuer_meta_address = other.issuer_meta_address;
+			key_size = other.key_size;
+			key_type = other.key_type;
+			token_type = other.token_type;
+			reqs = new Collection<ClaimTypeRequirement> (other.reqs);
+			additional_reqs = new Collection<XmlElement> (other.additional_reqs);
 		}
 
 		Binding binding;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs
index 37a82c01231..9d6a5f07978 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/KerberosSecurityTokenParameters.cs
@@ -37,8 +37,8 @@ namespace System.ServiceModel.Security.Tokens
 		{
 		}
 
-		protected KerberosSecurityTokenParameters (KerberosSecurityTokenParameters source)
-			: base (source)
+		protected KerberosSecurityTokenParameters (KerberosSecurityTokenParameters other)
+			: base (other)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs
index f0dcdee2cf1..02e2a7818b5 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/RsaSecurityTokenParameters.cs
@@ -39,8 +39,8 @@ namespace System.ServiceModel.Security.Tokens
 			RequireDerivedKeys = true;
 		}
 
-		protected RsaSecurityTokenParameters (RsaSecurityTokenParameters source)
-			: base (source)
+		protected RsaSecurityTokenParameters (RsaSecurityTokenParameters other)
+			: base (other)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs
index 41a1376f053..16ea4653b1c 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecureConversationSecurityTokenParameters.cs
@@ -111,11 +111,11 @@ namespace System.ServiceModel.Security.Tokens
 		}
 #endif
 
-		protected SecureConversationSecurityTokenParameters (SecureConversationSecurityTokenParameters source)
-			: base (source)
+		protected SecureConversationSecurityTokenParameters (SecureConversationSecurityTokenParameters other)
+			: base (other)
 		{
-			this.element = (SecurityBindingElement) source.element.Clone ();
-			this.cancellable = source.cancellable;
+			this.element = (SecurityBindingElement) other.element.Clone ();
+			this.cancellable = other.cancellable;
 #if !MOBILE && !XAMMAC_4_5
 			this.requirements = new ChannelProtectionRequirements (default_channel_protection_requirements);
 #endif
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs
index 846d8358f51..3bff55ef9db 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SecurityContextSecurityToken.cs
@@ -200,10 +200,10 @@ namespace System.ServiceModel.Security.Tokens
 			throw new NotSupportedException (String.Format ("X509SecurityToken does not support creation of {0}.", t));
 		}
 
-		public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause clause)
+		public override bool MatchesKeyIdentifierClause (SecurityKeyIdentifierClause keyIdentifierClause)
 		{
 			SecurityContextKeyIdentifierClause sctic =
-				clause as SecurityContextKeyIdentifierClause;
+				keyIdentifierClause as SecurityContextKeyIdentifierClause;
 			return sctic != null && sctic.ContextId == ContextId &&
 			       sctic.Generation == KeyGeneration;
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs
index 92bbf9d37f6..9eb21fd621c 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SslSecurityTokenParameters.cs
@@ -52,11 +52,11 @@ namespace System.ServiceModel.Security.Tokens
 			this.cancel = requireCancellation;
 		}
 
-		protected SslSecurityTokenParameters (SslSecurityTokenParameters source)
-			: base (source)
+		protected SslSecurityTokenParameters (SslSecurityTokenParameters other)
+			: base (other)
 		{
-			cert = source.cert;
-			cancel = source.cancel;
+			cert = other.cert;
+			cancel = other.cancel;
 		}
 
 		bool cert, cancel;
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs
index be273ce27e5..72e2cb0a92b 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityToken.cs
@@ -44,7 +44,7 @@ namespace System.ServiceModel.Security.Tokens
 		bool extract_groups, allow_unauth;
 
 		[MonoTODO]
-		public SspiSecurityToken (NetworkCredential cred,
+		public SspiSecurityToken (NetworkCredential networkCredential,
 			bool extractGroupsForWindowsAccounts,
 			bool allowUnauthenticatedCallers)
 		{
@@ -54,7 +54,7 @@ namespace System.ServiceModel.Security.Tokens
 		[MonoTODO]
 		public SspiSecurityToken (
 			TokenImpersonationLevel impersonationLevel,
-			bool allowNtlm, NetworkCredential cred)
+			bool allowNtlm, NetworkCredential networkCredential)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs
index 16cf529e431..1efbf1f1cd3 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/SspiSecurityTokenParameters.cs
@@ -47,10 +47,10 @@ namespace System.ServiceModel.Security.Tokens
 			this.cancel = requireCancellation;
 		}
 
-		protected SspiSecurityTokenParameters (SspiSecurityTokenParameters source)
-			: base (source)
+		protected SspiSecurityTokenParameters (SspiSecurityTokenParameters other)
+			: base (other)
 		{
-			this.cancel = source.cancel;
+			this.cancel = other.cancel;
 		}
 
 		public bool RequireCancellation {
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs
index 46f14360654..c69d8bb2c91 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/UserNameSecurityTokenParameters.cs
@@ -40,8 +40,8 @@ namespace System.ServiceModel.Security.Tokens
 			RequireDerivedKeys = false;
 		}
 
-		protected UserNameSecurityTokenParameters (UserNameSecurityTokenParameters source)
-			: base (source)
+		protected UserNameSecurityTokenParameters (UserNameSecurityTokenParameters other)
+			: base (other)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs
index c02dfd44342..2d2aa06d568 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security.Tokens/X509SecurityTokenParameters.cs
@@ -51,10 +51,10 @@ namespace System.ServiceModel.Security.Tokens
 			InclusionMode = inclusionMode;
 		}
 
-		protected X509SecurityTokenParameters (X509SecurityTokenParameters source)
-			: base (source)
+		protected X509SecurityTokenParameters (X509SecurityTokenParameters other)
+			: base (other)
 		{
-			reference_style = source.reference_style;
+			reference_style = other.reference_style;
 		}
 
 		public X509KeyIdentifierClauseType X509ReferenceStyle {
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs
index 17695f1ec28..7e30915cd66 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security/MessagePartSpecification.cs
@@ -95,14 +95,14 @@ namespace System.ServiceModel.Security
 				header_types = new ReadOnlyCollection<XmlQualifiedName> (header_types);
 		}
 
-		public void Union (MessagePartSpecification other)
+		public void Union (MessagePartSpecification specification)
 		{
-			if (other == null)
-				throw new ArgumentNullException ("other");
+			if (specification == null)
+				throw new ArgumentNullException ("specification");
 			if (header_types.IsReadOnly)
 				throw new InvalidOperationException ("This MessagePartSpecification is read-only.");
-			body |= other.body;
-			foreach (XmlQualifiedName q in other.header_types)
+			body |= specification.body;
+			foreach (XmlQualifiedName q in specification.header_types)
 				// Sigh. It could be much better here.
 				//if (!header_types.Contains (q))
 					header_types.Add (q);
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
index d788a5a0b27..b747dee7c98 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security/ServiceCredentialsSecurityTokenManager.cs
@@ -1,4 +1,4 @@
-//
+//
 // ServiceCredentialsSecurityTokenManager.cs
 //
 // Author:
@@ -44,9 +44,9 @@ namespace System.ServiceModel.Security
 		ServiceCredentials credentials;
 
 		public ServiceCredentialsSecurityTokenManager (
-			ServiceCredentials credentials)
+			ServiceCredentials parent)
 		{
-			this.credentials = credentials;
+			this.credentials = parent;
 		}
 
 		public ServiceCredentials ServiceCredentials {
@@ -55,35 +55,35 @@ namespace System.ServiceModel.Security
 
 		[MonoTODO]
 		public virtual EndpointIdentity GetIdentityOfSelf (
-			SecurityTokenRequirement requirement)
+			SecurityTokenRequirement tokenRequirement)
 		{
 			throw new NotImplementedException ();
 		}
 
 		[MonoTODO]
 		public override SecurityTokenAuthenticator CreateSecurityTokenAuthenticator (
-			SecurityTokenRequirement requirement,
+			SecurityTokenRequirement tokenRequirement,
 			out SecurityTokenResolver outOfBandTokenResolver)
 		{
 			outOfBandTokenResolver = null;
-			if (requirement.TokenType == SecurityTokenTypes.UserName)
-				return CreateUserNameAuthenticator (requirement);
-			if (requirement.TokenType == SecurityTokenTypes.X509Certificate)
-				return CreateX509Authenticator (requirement);
-			if (requirement.TokenType == SecurityTokenTypes.Rsa)
+			if (tokenRequirement.TokenType == SecurityTokenTypes.UserName)
+				return CreateUserNameAuthenticator (tokenRequirement);
+			if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate)
+				return CreateX509Authenticator (tokenRequirement);
+			if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa)
 				return new RsaSecurityTokenAuthenticator ();
-			if (requirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation) {
+			if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation) {
 				SecurityBindingElement binding;
-				if (!requirement.TryGetProperty<SecurityBindingElement> (ReqType.SecurityBindingElementProperty, out binding))
+				if (!tokenRequirement.TryGetProperty<SecurityBindingElement> (ReqType.SecurityBindingElementProperty, out binding))
 					throw new ArgumentException ("SecurityBindingElement is required in the security token requirement");
 				SecureConversationSecurityTokenParameters issuedParams;
-				if (!requirement.TryGetProperty<SecureConversationSecurityTokenParameters> (ReqType.IssuedSecurityTokenParametersProperty, out issuedParams))
+				if (!tokenRequirement.TryGetProperty<SecureConversationSecurityTokenParameters> (ReqType.IssuedSecurityTokenParametersProperty, out issuedParams))
 					throw new ArgumentException ("IssuedSecurityTokenParameters are required in the security token requirement");
 				BindingContext issuerBC;
-				if (!requirement.TryGetProperty<BindingContext> (ReqType.IssuerBindingContextProperty, out issuerBC))
+				if (!tokenRequirement.TryGetProperty<BindingContext> (ReqType.IssuerBindingContextProperty, out issuerBC))
 					throw new ArgumentException ("IssuerBindingContext is required in the security token requirement");
 				SecurityTokenVersion secVer;
-				if (!requirement.TryGetProperty<SecurityTokenVersion> (ReqType.MessageSecurityVersionProperty, out secVer))
+				if (!tokenRequirement.TryGetProperty<SecurityTokenVersion> (ReqType.MessageSecurityVersionProperty, out secVer))
 					throw new ArgumentException ("MessageSecurityVersion property (of type SecurityTokenVersion) is required in the security token requirement");
 
 				// FIXME: get parameters from somewhere
@@ -92,16 +92,16 @@ namespace System.ServiceModel.Security
 				outOfBandTokenResolver = resolver;
 				SecurityContextSecurityTokenAuthenticator sc =
 					new SecurityContextSecurityTokenAuthenticator ();
-				return new SecureConversationSecurityTokenAuthenticator (requirement, sc, resolver);
+				return new SecureConversationSecurityTokenAuthenticator (tokenRequirement, sc, resolver);
 			}
-			if (requirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego)
-				return CreateSslTokenAuthenticator (requirement);
-			if (requirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego)
-				return CreateSslTokenAuthenticator (requirement);
-			if (requirement.TokenType == ServiceModelSecurityTokenTypes.Spnego)
-				return CreateSpnegoTokenAuthenticator (requirement);
+			if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego)
+				return CreateSslTokenAuthenticator (tokenRequirement);
+			if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego)
+				return CreateSslTokenAuthenticator (tokenRequirement);
+			if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego)
+				return CreateSpnegoTokenAuthenticator (tokenRequirement);
 			else
-				throw new NotImplementedException ("Not implemented token type: " + requirement.TokenType);
+				throw new NotImplementedException ("Not implemented token type: " + tokenRequirement.TokenType);
 		}
 
 		SpnegoSecurityTokenAuthenticator CreateSpnegoTokenAuthenticator (SecurityTokenRequirement requirement)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs b/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs
index 026daa9a822..f690f32e867 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.Security/WSSecurityTokenSerializer.cs
@@ -239,7 +239,7 @@ namespace System.ServiceModel.Security
 
 		[MonoTODO]
 		public virtual SecurityKeyIdentifierClause CreateKeyIdentifierClauseFromTokenXml (
-			XmlElement tokenXml, SecurityTokenReferenceStyle referenceStyle)
+			XmlElement element, SecurityTokenReferenceStyle tokenReferenceStyle)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs
index ac3b605cf9d..0801770d6e9 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAccessDeniedException.cs
@@ -34,8 +34,8 @@ namespace System.ServiceModel {
 	public class AddressAccessDeniedException : CommunicationException
 	{
 		public AddressAccessDeniedException () : base () {}
-		public AddressAccessDeniedException (string msg) : base (msg) {}
-		public AddressAccessDeniedException (string msg, Exception inner) : base (msg, inner) {}
+		public AddressAccessDeniedException (string message) : base (message) {}
+		public AddressAccessDeniedException (string message, Exception innerException) : base (message, innerException) {}
 		protected AddressAccessDeniedException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs
index 70103060fb1..33e238146f5 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/AddressAlreadyInUseException.cs
@@ -34,8 +34,8 @@ namespace System.ServiceModel {
 	public class AddressAlreadyInUseException : CommunicationException
 	{
 		public AddressAlreadyInUseException () : base () {}
-		public AddressAlreadyInUseException (string msg) : base (msg) {}
-		public AddressAlreadyInUseException (string msg, Exception inner) : base (msg, inner) {}
+		public AddressAlreadyInUseException (string message) : base (message) {}
+		public AddressAlreadyInUseException (string message, Exception innerException) : base (message, innerException) {}
 		protected AddressAlreadyInUseException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
index 84b8f96db81..d4d00e768cc 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
@@ -299,11 +299,11 @@ namespace System.ServiceModel
 
 		protected void InitializeEndpoint (
 			string configurationName,
-			EndpointAddress remoteAddress)
+			EndpointAddress address)
 		{
 			InitializeEndpoint (CreateDescription ());
-			if (remoteAddress != null)
-				service_endpoint.Address = remoteAddress;
+			if (address != null)
+				service_endpoint.Address = address;
 			ApplyConfiguration (configurationName);
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs
index 0f6560c743f..25277d302b9 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory_1.cs
@@ -125,14 +125,14 @@ namespace System.ServiceModel
 			return ch;
 		}
 
-		public static TChannel CreateChannel (Binding binding, EndpointAddress address)
+		public static TChannel CreateChannel (Binding binding, EndpointAddress endpointAddress)
 		{
-			return CreateChannelCore (new ChannelFactory<TChannel> (binding, address), f => f.CreateChannel ());
+			return CreateChannelCore (new ChannelFactory<TChannel> (binding, endpointAddress), f => f.CreateChannel ());
 		}
 
-		public static TChannel CreateChannel (Binding binding, EndpointAddress address, Uri via)
+		public static TChannel CreateChannel (Binding binding, EndpointAddress endpointAddress, Uri via)
 		{
-			return CreateChannelCore (new ChannelFactory<TChannel> (binding), f => f.CreateChannel (address, via));
+			return CreateChannelCore (new ChannelFactory<TChannel> (binding), f => f.CreateChannel (endpointAddress, via));
 		}
 
 		public virtual TChannel CreateChannel (EndpointAddress address, Uri via)
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs
index 012b9b141ef..2a5c04c74eb 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChannelTerminatedException.cs
@@ -35,8 +35,8 @@ namespace System.ServiceModel
 	public class ChannelTerminatedException : CommunicationException
 	{
 		public ChannelTerminatedException () : base () {}
-		public ChannelTerminatedException (string msg) : base (msg) {}
-		public ChannelTerminatedException (string msg, Exception inner) : base (msg, inner) {}
+		public ChannelTerminatedException (string message) : base (message) {}
+		public ChannelTerminatedException (string message, Exception innerException) : base (message, innerException) {}
 		protected ChannelTerminatedException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
index 09f72793c27..54d4067b3af 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientBase.cs
@@ -75,58 +75,58 @@ namespace System.ServiceModel
 		{
 		}
 
-		protected ClientBase (InstanceContext instance)
-			: this (instance, "*")
+		protected ClientBase (InstanceContext callbackInstance)
+			: this (callbackInstance, "*")
 		{
 		}
 
-		protected ClientBase (InstanceContext instance, string endpointConfigurationName)
+		protected ClientBase (InstanceContext callbackInstance, string endpointConfigurationName)
 		{
-			if (instance == null)
+			if (callbackInstance == null)
 				throw new ArgumentNullException ("instanceContext");
 			if (endpointConfigurationName == null)
 				throw new ArgumentNullException ("endpointConfigurationName");
 
-			Initialize (instance, endpointConfigurationName, null);
+			Initialize (callbackInstance, endpointConfigurationName, null);
 		}
 
-		protected ClientBase (InstanceContext instance,
+		protected ClientBase (InstanceContext callbackInstance,
 			string endpointConfigurationName, EndpointAddress remoteAddress)
 		{
-			if (instance == null)
+			if (callbackInstance == null)
 				throw new ArgumentNullException ("instanceContext");
 			if (endpointConfigurationName == null)
 				throw new ArgumentNullException ("endpointConfigurationName");
 			if (remoteAddress == null)
 				throw new ArgumentNullException ("remoteAddress");
 
-			Initialize (instance, endpointConfigurationName, remoteAddress);
+			Initialize (callbackInstance, endpointConfigurationName, remoteAddress);
 		}
 
-		protected ClientBase (InstanceContext instance,
+		protected ClientBase (InstanceContext callbackInstance,
 			string endpointConfigurationName, string remoteAddress)
 		{
-			if (instance == null)
+			if (callbackInstance == null)
 				throw new ArgumentNullException ("instanceContext");
 			if (remoteAddress == null)
 				throw new ArgumentNullException ("endpointAddress");
 			if (endpointConfigurationName == null)
 				throw new ArgumentNullException ("endpointConfigurationName");
 
-			Initialize (instance, endpointConfigurationName, new EndpointAddress (remoteAddress));
+			Initialize (callbackInstance, endpointConfigurationName, new EndpointAddress (remoteAddress));
 		}
 
-		protected ClientBase (InstanceContext instance,
+		protected ClientBase (InstanceContext callbackInstance,
 			Binding binding, EndpointAddress remoteAddress)
 		{
-			if (instance == null)
+			if (callbackInstance == null)
 				throw new ArgumentNullException ("instanceContext");
 			if (binding == null)
 				throw new ArgumentNullException ("binding");
 			if (remoteAddress == null)
 				throw new ArgumentNullException ("remoteAddress");
 
-			Initialize (instance, binding, remoteAddress);
+			Initialize (callbackInstance, binding, remoteAddress);
 		}
 
 		protected ClientBase (ServiceEndpoint endpoint)
@@ -134,8 +134,8 @@ namespace System.ServiceModel
 		{
 		}
 
-		protected ClientBase (InstanceContext instance, ServiceEndpoint endpoint)
-			: this (instance, new ChannelFactory<TChannel> (endpoint))
+		protected ClientBase (InstanceContext callbackInstance, ServiceEndpoint endpoint)
+			: this (callbackInstance, new ChannelFactory<TChannel> (endpoint))
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
index af12296808a..c19ad84413e 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ClientCredentialsSecurityTokenManager.cs
@@ -1,4 +1,4 @@
-//
+//
 // ClientCredentialsSecurityTokenManager.cs
 //
 // Author:
@@ -45,11 +45,11 @@ namespace System.ServiceModel
 	{
 		ClientCredentials credentials;
 
-		public ClientCredentialsSecurityTokenManager (ClientCredentials credentials)
+		public ClientCredentialsSecurityTokenManager (ClientCredentials clientCredentials)
 		{
-			if (credentials == null)
-				throw new ArgumentNullException ("credentials");
-			this.credentials = credentials;
+			if (clientCredentials == null)
+				throw new ArgumentNullException ("clientCredentials");
+			this.credentials = clientCredentials;
 		}
 
 		public ClientCredentials ClientCredentials {
@@ -58,25 +58,25 @@ namespace System.ServiceModel
 
 		[MonoTODO]
 		public override SecurityTokenAuthenticator CreateSecurityTokenAuthenticator (
-			SecurityTokenRequirement requirement,
+			SecurityTokenRequirement tokenRequirement,
 			out SecurityTokenResolver outOfBandTokenResolver)
 		{
 			outOfBandTokenResolver = null;
-			if (requirement == null)
-				throw new ArgumentNullException ("requirement");
-			if (requirement.TokenType == SecurityTokenTypes.UserName) {
+			if (tokenRequirement == null)
+				throw new ArgumentNullException ("tokenRequirement");
+			if (tokenRequirement.TokenType == SecurityTokenTypes.UserName) {
 				// unsupported
 			}
-			else if (requirement.TokenType == SecurityTokenTypes.Rsa)
+			else if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa)
 				return new RsaSecurityTokenAuthenticator ();
-			else if (requirement.TokenType == SecurityTokenTypes.X509Certificate)
-				return CreateX509Authenticator (requirement);
-			else if (requirement.TokenType == ServiceModelSecurityTokenTypes.Spnego)
-				return new SspiClientSecurityTokenAuthenticator (this, requirement);
+			else if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate)
+				return CreateX509Authenticator (tokenRequirement);
+			else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego)
+				return new SspiClientSecurityTokenAuthenticator (this, tokenRequirement);
 			else
-				throw new NotImplementedException ("Security token type " + requirement.TokenType);
+				throw new NotImplementedException ("Security token type " + tokenRequirement.TokenType);
 
-			throw new NotSupportedException (String.Format ("Security token requirement '{0}' is not supported to create SecurityTokenAuthenticator.", requirement));
+			throw new NotSupportedException (String.Format ("Security token requirement '{0}' is not supported to create SecurityTokenAuthenticator.", tokenRequirement));
 		}
 
 
@@ -102,40 +102,40 @@ namespace System.ServiceModel
 		#region CreateSecurityTokenProvider()
 
 		[MonoTODO]
-		public override SecurityTokenProvider CreateSecurityTokenProvider (SecurityTokenRequirement requirement)
+		public override SecurityTokenProvider CreateSecurityTokenProvider (SecurityTokenRequirement tokenRequirement)
 		{
-			if (IsIssuedSecurityTokenRequirement (requirement))
-				return CreateIssuedTokenProvider (requirement);
+			if (IsIssuedSecurityTokenRequirement (tokenRequirement))
+				return CreateIssuedTokenProvider (tokenRequirement);
 
 			bool isInitiator;
 
 			// huh, they are not constants but properties.
-			if (requirement.TokenType == SecurityTokenTypes.X509Certificate)
-				return CreateX509SecurityTokenProvider (requirement);
-			else if (requirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation)
-				return CreateSecureConversationProvider (requirement);
-			else if (requirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) {
-				if (requirement.TryGetProperty<bool> (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
-					return CreateSslnegoProvider (requirement);
-			} else if (requirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) {
-				if (requirement.TryGetProperty<bool> (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
-					return CreateSslnegoProvider (requirement);
-			} else if (requirement.TokenType == ServiceModelSecurityTokenTypes.SecurityContext) {
+			if (tokenRequirement.TokenType == SecurityTokenTypes.X509Certificate)
+				return CreateX509SecurityTokenProvider (tokenRequirement);
+			else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecureConversation)
+				return CreateSecureConversationProvider (tokenRequirement);
+			else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.AnonymousSslnego) {
+				if (tokenRequirement.TryGetProperty<bool> (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
+					return CreateSslnegoProvider (tokenRequirement);
+			} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.MutualSslnego) {
+				if (tokenRequirement.TryGetProperty<bool> (ReqType.IsInitiatorProperty, out isInitiator) && isInitiator)
+					return CreateSslnegoProvider (tokenRequirement);
+			} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SecurityContext) {
 				// FIXME: implement
-			} else if (requirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) {
-				return CreateSpnegoProvider (requirement);
-			} else if (requirement.TokenType == ServiceModelSecurityTokenTypes.SspiCredential) {
+			} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.Spnego) {
+				return CreateSpnegoProvider (tokenRequirement);
+			} else if (tokenRequirement.TokenType == ServiceModelSecurityTokenTypes.SspiCredential) {
 				// FIXME: implement
-			} else if (requirement.TokenType == SecurityTokenTypes.Rsa) {
+			} else if (tokenRequirement.TokenType == SecurityTokenTypes.Rsa) {
 				// FIXME: implement
-			} else if (requirement.TokenType == SecurityTokenTypes.Saml) {
+			} else if (tokenRequirement.TokenType == SecurityTokenTypes.Saml) {
 				// FIXME: implement
-			} else if (requirement.TokenType == SecurityTokenTypes.UserName)
-				return CreateUserNameProvider (requirement);
-			else if (requirement.TokenType == SecurityTokenTypes.Kerberos) {
-				return CreateKerberosProvider (requirement);
+			} else if (tokenRequirement.TokenType == SecurityTokenTypes.UserName)
+				return CreateUserNameProvider (tokenRequirement);
+			else if (tokenRequirement.TokenType == SecurityTokenTypes.Kerberos) {
+				return CreateKerberosProvider (tokenRequirement);
 			}
-			throw new NotSupportedException (String.Format ("Token type '{0}' is not supported", requirement.TokenType));
+			throw new NotSupportedException (String.Format ("Token type '{0}' is not supported", tokenRequirement.TokenType));
 		}
 
 		UserNameSecurityTokenProvider CreateUserNameProvider (
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs
index 01336d803a5..51d7685b53b 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexChannelFactory.cs
@@ -93,47 +93,47 @@ namespace System.ServiceModel
 			callback_instance_type = callbackInstanceType;
 		}
 
-		public DuplexChannelFactory (object callbackInstance)
-			: this (new InstanceContext (callbackInstance))
+		public DuplexChannelFactory (object callbackObject)
+			: this (new InstanceContext (callbackObject))
 		{
 		}
 
-		public DuplexChannelFactory (object callbackInstance,
+		public DuplexChannelFactory (object callbackObject,
 			string endpointConfigurationName)
-			: this (new InstanceContext (callbackInstance), endpointConfigurationName)
+			: this (new InstanceContext (callbackObject), endpointConfigurationName)
 		{
 		}
 
-		public DuplexChannelFactory (object callbackInstance,
+		public DuplexChannelFactory (object callbackObject,
 			string endpointConfigurationName,
 			EndpointAddress remoteAddress)
-			: this (new InstanceContext (callbackInstance), endpointConfigurationName, remoteAddress)
+			: this (new InstanceContext (callbackObject), endpointConfigurationName, remoteAddress)
 		{
 		}
 
-		public DuplexChannelFactory (object callbackInstance,
+		public DuplexChannelFactory (object callbackObject,
 			ServiceEndpoint endpoint)
-			: this (new InstanceContext (callbackInstance), endpoint)
+			: this (new InstanceContext (callbackObject), endpoint)
 		{
 		}
 
-		public DuplexChannelFactory (object callbackInstance,
+		public DuplexChannelFactory (object callbackObject,
 			Binding binding)
-			: this (new InstanceContext (callbackInstance), binding)
+			: this (new InstanceContext (callbackObject), binding)
 		{
 		}
 
-		public DuplexChannelFactory (object callbackInstance,
+		public DuplexChannelFactory (object callbackObject,
 			Binding binding,
 			string remoteAddress)
-			: this (callbackInstance, binding, new EndpointAddress (remoteAddress))
+			: this (callbackObject, binding, new EndpointAddress (remoteAddress))
 		{
 		}
 
-		public DuplexChannelFactory (object callbackInstance,
+		public DuplexChannelFactory (object callbackObject,
 			Binding binding,
 			EndpointAddress remoteAddress)
-			: this (new InstanceContext (callbackInstance), binding, remoteAddress)
+			: this (new InstanceContext (callbackObject), binding, remoteAddress)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs
index 64ce85812b5..c51ce43a777 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/DuplexClientBase.cs
@@ -52,8 +52,8 @@ namespace System.ServiceModel
 		}
 
 		protected DuplexClientBase (object callbackInstance,
-			string bindingConfigurationName, EndpointAddress remoteAddress)
-			: this (new InstanceContext (callbackInstance), bindingConfigurationName, remoteAddress)
+			string endpointConfigurationName, EndpointAddress remoteAddress)
+			: this (new InstanceContext (callbackInstance), endpointConfigurationName, remoteAddress)
 		{
 		}
 
@@ -87,8 +87,8 @@ namespace System.ServiceModel
 		}
 
 		protected DuplexClientBase (InstanceContext callbackInstance,
-			string endpointConfigurationName, EndpointAddress address)
-			: base (callbackInstance, endpointConfigurationName, address)
+			string endpointConfigurationName, EndpointAddress remoteAddress)
+			: base (callbackInstance, endpointConfigurationName, remoteAddress)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs
index 1740e4d9906..19e8a56ae74 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs
@@ -406,19 +406,19 @@ namespace System.ServiceModel
 		public void WriteTo (
 			AddressingVersion addressingVersion,
 			XmlDictionaryWriter writer,
-			XmlDictionaryString localname,
+			XmlDictionaryString localName,
 			XmlDictionaryString ns)
 		{
-			writer.WriteStartElement (localname, ns);
+			writer.WriteStartElement (localName, ns);
 			WriteContentsTo (addressingVersion, writer);
 			writer.WriteEndElement ();
 		}
 
 		public void WriteTo (
 			AddressingVersion addressingVersion,
-			XmlWriter writer, string localname, string ns)
+			XmlWriter writer, string localName, string ns)
 		{
-			writer.WriteStartElement (localname, ns);
+			writer.WriteStartElement (localName, ns);
 			WriteContentsTo (addressingVersion, writer);
 			writer.WriteEndElement ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs
index 71ff2f0f134..9963d396158 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/EndpointIdentity.cs
@@ -110,9 +110,9 @@ namespace System.ServiceModel
 			return new X509CertificateEndpointIdentity (primaryCertificate, supportingCertificates);
 		}
 
-		public override bool Equals (object other)
+		public override bool Equals (object obj)
 		{
-			EndpointIdentity e = other as EndpointIdentity;
+			EndpointIdentity e = obj as EndpointIdentity;
 			return e != null && comparer.Equals (claim, e.claim);
 		}
 
@@ -126,19 +126,19 @@ namespace System.ServiceModel
 			return String.Concat ("identity(", claim, ")");
 		}
 
-		protected void Initialize (Claim claim)
+		protected void Initialize (Claim identityClaim)
 		{
-			Initialize (claim, Claim.DefaultComparer);
+			Initialize (identityClaim, Claim.DefaultComparer);
 		}
 
-		protected void Initialize (Claim claim, IEqualityComparer<Claim> comparer)
+		protected void Initialize (Claim identityClaim, IEqualityComparer<Claim> claimComparer)
 		{
-			if (claim == null)
-				throw new ArgumentNullException ("claim");
-			if (comparer == null)
-				throw new ArgumentNullException ("comparer");
-			this.claim = claim;
-			this.comparer = comparer;
+			if (identityClaim == null)
+				throw new ArgumentNullException ("identityClaim");
+			if (claimComparer == null)
+				throw new ArgumentNullException ("claimComparer");
+			this.claim = identityClaim;
+			this.comparer = claimComparer;
 		}
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs
index 05b3af01caf..1fdfa99acfb 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/FaultException.cs
@@ -44,13 +44,13 @@ namespace System.ServiceModel
 		{
 		}
 
-		public FaultException (string msg)
-			: this (new FaultReason (msg))
+		public FaultException (string reason)
+			: this (new FaultReason (reason))
 		{
 		}
 
-		public FaultException (string msg, FaultCode code)
-			: this (new FaultReason (msg), code)
+		public FaultException (string reason, FaultCode code)
+			: this (new FaultReason (reason), code)
 		{
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs
index 223cd81753e..f9970c33e4a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqException.cs
@@ -36,9 +36,9 @@ namespace System.ServiceModel
 	public class MsmqException : ExternalException
 	{
 		public MsmqException () : base () {}
-		public MsmqException (string msg) : base (msg) {}
-		public MsmqException (string msg, int win32ErrorCode) : base (msg, win32ErrorCode) {}
-		public MsmqException (string msg, Exception inner) : base (msg, inner) {}
+		public MsmqException (string message) : base (message) {}
+		public MsmqException (string message, int error) : base (message, error) {}
+		public MsmqException (string message, Exception inner) : base (message, inner) {}
 		protected MsmqException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs
index 57fc6fe2872..120a5ad8a2e 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/MsmqPoisonMessageException.cs
@@ -35,8 +35,8 @@ namespace System.ServiceModel
 	public class MsmqPoisonMessageException : PoisonMessageException
 	{
 		public MsmqPoisonMessageException () : base () {}
-		public MsmqPoisonMessageException (string msg) : base (msg) {}
-		public MsmqPoisonMessageException (string msg, Exception inner) : base (msg, inner) {}
+		public MsmqPoisonMessageException (string message) : base (message) {}
+		public MsmqPoisonMessageException (string message, Exception innerException) : base (message, innerException) {}
 		protected MsmqPoisonMessageException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs b/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs
index 3d8ebe30b81..9dd6a596917 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/OptionalReliableSession.cs
@@ -1,4 +1,4 @@
-//
+//
 // OptionalReliableSession.cs
 //
 // Author:
@@ -42,11 +42,11 @@ namespace System.ServiceModel
 		{
 		}
 
-		public OptionalReliableSession (ReliableSessionBindingElement binding)
-			: base (binding)
+		public OptionalReliableSession (ReliableSessionBindingElement reliableSessionBindingElement)
+			: base (reliableSessionBindingElement)
 		{
-			if (binding == null)
-				throw new ArgumentNullException ("binding");
+			if (reliableSessionBindingElement == null)
+				throw new ArgumentNullException ("reliableSessionBindingElement");
 		}
 
 		public bool Enabled {
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs b/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs
index 9d0fc743e67..99751678f47 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/PoisonMessageException.cs
@@ -35,8 +35,8 @@ namespace System.ServiceModel
 	public class PoisonMessageException : SystemException
 	{
 		public PoisonMessageException () : base () {}
-		public PoisonMessageException (string msg) : base (msg) {}
-		public PoisonMessageException (string msg, Exception inner) : base (msg, inner) {}
+		public PoisonMessageException (string message) : base (message) {}
+		public PoisonMessageException (string message, Exception innerException) : base (message, innerException) {}
 		protected PoisonMessageException (SerializationInfo info, StreamingContext context) :
 			base (info, context) {}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs
index 5a5a3509e68..243ae798b2a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ReliableSession.cs
@@ -1,4 +1,4 @@
-//
+//
 // ReliableSession.cs
 //
 // Author:
@@ -39,12 +39,12 @@ namespace System.ServiceModel
 		{
 		}
 
-		public ReliableSession (ReliableSessionBindingElement binding)
+		public ReliableSession (ReliableSessionBindingElement reliableSessionBindingElement)
 		{
-			if (binding == null)
-				throw new ArgumentNullException ("binding");
-			InactivityTimeout = binding.InactivityTimeout;
-			Ordered = binding.Ordered;
+			if (reliableSessionBindingElement == null)
+				throw new ArgumentNullException ("reliableSessionBindingElement");
+			InactivityTimeout = reliableSessionBindingElement.InactivityTimeout;
+			Ordered = reliableSessionBindingElement.Ordered;
 		}
 
 		public TimeSpan InactivityTimeout { get; set; }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs
index 1d0bf8fefc0..caca3f0b843 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/RsaEndpointIdentity.cs
@@ -49,11 +49,11 @@ namespace System.ServiceModel
 			throw new NotImplementedException ();
 		}
 
-		public RsaEndpointIdentity (X509Certificate2 cert)
+		public RsaEndpointIdentity (X509Certificate2 certificate)
 		{
-			if (cert == null)
-				throw new ArgumentNullException ("cert");
-			rsa = (RSA) cert.PublicKey.Key;
+			if (certificate == null)
+				throw new ArgumentNullException ("certificate");
+			rsa = (RSA) certificate.PublicKey.Key;
 		}
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs
index 4a547c3ab8b..14b5cec4aa8 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceAuthorizationManager.cs
@@ -33,24 +33,24 @@ namespace System.ServiceModel
 {
 	public class ServiceAuthorizationManager
 	{
-		public virtual bool CheckAccess (OperationContext context)
+		public virtual bool CheckAccess (OperationContext operationContext)
 		{
-			return CheckAccessCore (context);
+			return CheckAccessCore (operationContext);
 		}
 
-		public virtual bool CheckAccess (OperationContext context, ref Message message)
+		public virtual bool CheckAccess (OperationContext operationContext, ref Message message)
 		{
-			return CheckAccessCore (context);
+			return CheckAccessCore (operationContext);
 		}
 
 		[MonoTODO]
-		protected virtual bool CheckAccessCore (OperationContext context)
+		protected virtual bool CheckAccessCore (OperationContext operationContext)
 		{
 			return false;
 		}
 
 		[MonoTODO]
-		protected virtual ReadOnlyCollection<IAuthorizationPolicy> GetAuthorizationPolicies (OperationContext context)
+		protected virtual ReadOnlyCollection<IAuthorizationPolicy> GetAuthorizationPolicies (OperationContext operationContext)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs
index e438c8f5b71..47c3bc2993c 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHost.cs
@@ -45,12 +45,12 @@ namespace System.ServiceModel
 		{
 		}
 
-		public ServiceHost (object serviceInstance,
+		public ServiceHost (object singletonInstance,
 			params Uri [] baseAddresses)
 		{
-			if (serviceInstance == null)
-				throw new ArgumentNullException ("serviceInstance");
-			InitializeDescription (serviceInstance,
+			if (singletonInstance == null)
+				throw new ArgumentNullException ("singletonInstance");
+			InitializeDescription (singletonInstance,
 				new UriSchemeKeyedCollection (baseAddresses));
 		}
 
@@ -165,10 +165,10 @@ namespace System.ServiceModel
 			InitializeDescription (baseAddresses);
 		}
 
-		protected void InitializeDescription (object serviceInstance, UriSchemeKeyedCollection baseAddresses)
+		protected void InitializeDescription (object singletonInstance, UriSchemeKeyedCollection baseAddresses)
 		{
-			instance = serviceInstance;
-			InitializeDescription (serviceInstance.GetType (), baseAddresses);
+			instance = singletonInstance;
+			InitializeDescription (singletonInstance.GetType (), baseAddresses);
 		}
 	}
 }
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
index 29a3d4aba6d..1a84cecc584 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ServiceHostBase.cs
@@ -492,9 +492,9 @@ namespace System.ServiceModel
 				throw new InvalidOperationException ("The ServiceHost must have at least one application endpoint (that does not include metadata exchange endpoint) defined by either configuration, behaviors or call to AddServiceEndpoint methods.");
 		}
 
-		protected void LoadConfigurationSection (ServiceElement element)
+		protected void LoadConfigurationSection (ServiceElement serviceSection)
 		{
-			ApplyServiceElement (element);
+			ApplyServiceElement (serviceSection);
 		}
 
 		protected override sealed void OnAbort ()
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs b/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs
index c2ea59f9a8a..8430860cb79 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/UriSchemeKeyedCollection.cs
@@ -35,24 +35,24 @@ namespace System.ServiceModel
 	public class UriSchemeKeyedCollection
 		: SynchronizedKeyedCollection<string, Uri>
 	{
-		public UriSchemeKeyedCollection (params Uri [] uris)
+		public UriSchemeKeyedCollection (params Uri [] addresses)
 			: base (new object ())
 		{
-			if (uris == null)
+			if (addresses == null)
 				/* FIXME: masterinfo says, param name should be
 				   baseAddresses */
-				throw new ArgumentNullException ("uris");
+				throw new ArgumentNullException ("addresses");
 
-			for (int i = 0; i < uris.Length; i ++) {
-				if (!uris [i].IsAbsoluteUri)
+			for (int i = 0; i < addresses.Length; i ++) {
+				if (!addresses [i].IsAbsoluteUri)
 					throw new ArgumentException ("Only an absolute URI can be used as a base address");
 
-				if (Contains (uris [i].Scheme))
-					throw new ArgumentException ("Collection already contains an address with scheme "+ uris [i].Scheme);
-				if (uris [i].Query != String.Empty)
+				if (Contains (addresses [i].Scheme))
+					throw new ArgumentException ("Collection already contains an address with scheme "+ addresses [i].Scheme);
+				if (addresses [i].Query != String.Empty)
 					throw new ArgumentException ("A base address cannot contain a query string.");
 
-				InsertItem (i, uris [i]);
+				InsertItem (i, addresses [i]);
 			}
 		}
 
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs
index c0b1564ff24..b0af17b06e8 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007FederationHttpBinding.cs
@@ -1,4 +1,4 @@
-//
+//
 // WS2007FederationHttpBinding.cs
 //
 // Author:
@@ -52,8 +52,8 @@ namespace System.ServiceModel
 		}
 
 		[MonoTODO]
-		public WS2007FederationHttpBinding (string configurationName)
-			: base (configurationName)
+		public WS2007FederationHttpBinding (string configName)
+			: base (configName)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs
index 4ac7a2ea481..0a5cfbc3394 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/WS2007HttpBinding.cs
@@ -1,4 +1,4 @@
-//
+//
 // WS2007HttpBinding.cs
 //
 // Author:
@@ -40,19 +40,19 @@ namespace System.ServiceModel
 		{
 		}
 
-		public WS2007HttpBinding (SecurityMode mode)
-			: base (mode)
+		public WS2007HttpBinding (SecurityMode securityMode)
+			: base (securityMode)
 		{
 		}
 
-		public WS2007HttpBinding (SecurityMode mode, bool reliableSessionEnabled)
-			: base (mode, reliableSessionEnabled)
+		public WS2007HttpBinding (SecurityMode securityMode, bool reliableSessionEnabled)
+			: base (securityMode, reliableSessionEnabled)
 		{
 		}
 
 		[MonoTODO]
-		public WS2007HttpBinding (string configurationName)
-			: base (configurationName)
+		public WS2007HttpBinding (string configName)
+			: base (configName)
 		{
 		}
 	}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs
index cfc054ea7ae..7fc121e8ad5 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/WSFederationHttpBinding.cs
@@ -61,7 +61,7 @@ namespace System.ServiceModel
 		}
 
 		[MonoTODO]
-		public WSFederationHttpBinding (string configurationName)
+		public WSFederationHttpBinding (string configName)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs b/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs
index 0a56a6df1fb..90a4849a6e3 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/WSHttpBinding.cs
@@ -1,4 +1,4 @@
-//
+//
 // WSHttpBinding.cs
 //
 // Author:
@@ -45,20 +45,20 @@ namespace System.ServiceModel
 		{
 		}
 
-		public WSHttpBinding (SecurityMode mode)
-			: this (mode, false)
+		public WSHttpBinding (SecurityMode securityMode)
+			: this (securityMode, false)
 		{
 		}
 
-		public WSHttpBinding (SecurityMode mode,
+		public WSHttpBinding (SecurityMode securityMode,
 			bool reliableSessionEnabled)
 			: base (reliableSessionEnabled)
 		{
-			security = new WSHttpSecurity (mode);
+			security = new WSHttpSecurity (securityMode);
 		}
 
 		[MonoTODO]
-		public WSHttpBinding (string configurationName)
+		public WSHttpBinding (string configName)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs b/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs
index 88845ed8a60..3b71fc19e74 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/X509CertificateEndpointIdentity.cs
@@ -40,12 +40,12 @@ namespace System.ServiceModel
 		X509Certificate2 primary;
 		X509Certificate2Collection supporting, all;
 
-		public X509CertificateEndpointIdentity (X509Certificate2 cert)
+		public X509CertificateEndpointIdentity (X509Certificate2 certificate)
 		{
-			if (cert == null)
-				throw new ArgumentNullException ("cert");
-			primary = cert;
-			Initialize (Claim.CreateThumbprintClaim (cert.GetCertHash ()));
+			if (certificate == null)
+				throw new ArgumentNullException ("certificate");
+			primary = certificate;
+			Initialize (Claim.CreateThumbprintClaim (certificate.GetCertHash ()));
 		}
 
 		public X509CertificateEndpointIdentity (