Sync parameter names in System.Data with .NET.

38 files changed, 336 insertions, 336 deletions

diff --git a/mcs/class/System.Data/Microsoft.SqlServer.Server/IBinarySerialize.cs b/mcs/class/System.Data/Microsoft.SqlServer.Server/IBinarySerialize.cs
index b78786dd456..cf1624b86a6 100644
--- a/mcs/class/System.Data/Microsoft.SqlServer.Server/IBinarySerialize.cs
+++ b/mcs/class/System.Data/Microsoft.SqlServer.Server/IBinarySerialize.cs
@@ -40,7 +40,7 @@ namespace Microsoft.SqlServer.Server {
 		#region Methods
 
 		void Read (BinaryReader r);
-		void Write (BinaryWriter r);
+		void Write (BinaryWriter w);
 
 		#endregion // Methods
 	}
diff --git a/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlMetaData.cs b/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlMetaData.cs
index 81651b39ead..f939a38b294 100644
--- a/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlMetaData.cs
+++ b/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlMetaData.cs
@@ -44,87 +44,87 @@ namespace Microsoft.SqlServer.Server {
 
 		SqlCompareOptions compareOptions = SqlCompareOptions.None;
 		string databaseName = null;
-		long localeId = 0L;
+		long _localeId = 0L;
 		long maxLength = 0L;
 		string name;
 		byte precision = 10;
 		byte scale = 0;
 		string owningSchema = null;
 		string objectName = null;
-		SqlDbType sqlDbType = SqlDbType.NVarChar;
-		DbType dbType = DbType.String;
+		SqlDbType _sqlDbType = SqlDbType.NVarChar;
+		DbType _dbType = DbType.String;
 		Type type = typeof (string);
 
 		#endregion // Fields
 
 		#region Constructors
 
-		public SqlMetaData (string name, SqlDbType sqlDbType)
+		public SqlMetaData (string name, SqlDbType dbType)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name can not be null");
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Bit:
 				maxLength = 1;
 				precision = 1;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Boolean;
+				_dbType = DbType.Boolean;
 				type = typeof (bool);
 				break;
 			case SqlDbType.BigInt:
 				maxLength = 8;
 				precision = 19;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int64;
+				_dbType = DbType.Int64;
 				type = typeof (long);
 				break;
 			case SqlDbType.DateTime:
 				maxLength = 8;
 				precision = 23;
 				scale = 3;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.DateTime;
+				_dbType = DbType.DateTime;
 				type = typeof (DateTime);
 				break;
 			case SqlDbType.Decimal:
 				maxLength = 9;
 				precision = 18;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Decimal;
+				_dbType = DbType.Decimal;
 				type = typeof (decimal);
 				break;
 			case SqlDbType.Float:
 				maxLength = 8;
 				precision = 53;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Double;
+				_dbType = DbType.Double;
 				type = typeof (float);
 				break;
 			case SqlDbType.Int:
 				maxLength = 4;
 				precision = 10;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int32;
+				_dbType = DbType.Int32;
 				type = typeof (int);
 				break;
 			case SqlDbType.Money:
 				maxLength = 8;
 				precision = 19;
 				scale = 4;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Currency;
+				_dbType = DbType.Currency;
 				type = typeof (double);
 				break;
 			  /*
@@ -140,139 +140,139 @@ namespace Microsoft.SqlServer.Server {
 				maxLength = 4;
 				precision = 16;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.DateTime;
+				_dbType = DbType.DateTime;
 				type = typeof (DateTime);
 				break;
 			case SqlDbType.SmallInt:
 				maxLength = 2;
 				precision = 5;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int16;
+				_dbType = DbType.Int16;
 				type = typeof (short);
 				break;
 			case SqlDbType.SmallMoney:
 				maxLength = 4;
 				precision = 10;
 				scale = 4;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Currency;
+				_dbType = DbType.Currency;
 				type = typeof (double);
 				break;
 			case SqlDbType.Timestamp:
 				maxLength = 8;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.DateTime;
+				_dbType = DbType.DateTime;
 				type = typeof (DateTime);
 				break;
 			case SqlDbType.TinyInt:
 				maxLength = 1;
 				precision = 3;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int16;
+				_dbType = DbType.Int16;
 				type = typeof (short);
 				break;
 			case SqlDbType.UniqueIdentifier:
 				maxLength = 16;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Guid;
+				_dbType = DbType.Guid;
 				type = typeof (Guid);
 				break;
 			case SqlDbType.Xml:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.Xml;
+				_dbType = DbType.Xml;
 				type = typeof (string);
 				break;
 			default:
 				throw new ArgumentException ("SqlDbType not supported");
 			}
 			this.name = name;
-			this.sqlDbType = sqlDbType;
+			this._sqlDbType = dbType;
 		}
 
-		public SqlMetaData (string name, SqlDbType sqlDbType, long maxLength)
+		public SqlMetaData (string name, SqlDbType dbType, long maxLength)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name can not be null");
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Binary:
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.Binary;
+				_dbType = DbType.Binary;
 				type = typeof (byte []);
 				break;
 			case SqlDbType.Char:
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				_localeId = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.AnsiStringFixedLength;
+				_dbType = DbType.AnsiStringFixedLength;
 				type = typeof (string);
 				break;
 			case SqlDbType.Image:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Binary;
+				_dbType = DbType.Binary;
 				type = typeof (byte []);
 				break;
 			case SqlDbType.NChar:
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				_localeId = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (string);
 				break;
 			case SqlDbType.NText:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				_localeId = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (string);
 				break;
 			case SqlDbType.NVarChar:
 				maxLength = -1;
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				_localeId = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (string);
 				break;
 			case SqlDbType.Text:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				_localeId = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (char []);
 				break;
 			case SqlDbType.VarBinary:
 				maxLength = -1;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.Binary;
+				_dbType = DbType.Binary;
 				type = typeof (byte []);
 				break;
 			case SqlDbType.VarChar:
 				maxLength = -1;
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				_localeId = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (char []);
 				break;
 			default:
@@ -280,22 +280,22 @@ namespace Microsoft.SqlServer.Server {
 			}
 			this.maxLength = maxLength;
 			this.name = name;
-			this.sqlDbType = sqlDbType;
+			this._sqlDbType = dbType;
 		}
 
 		[MonoTODO]
-		public SqlMetaData (string name, SqlDbType sqlDbType, Type userDefinedType)
+		public SqlMetaData (string name, SqlDbType dbType, Type userDefinedType)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name can not be null");
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Udt:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Guid;
+				_dbType = DbType.Guid;
 				type = typeof (Guid);
 				break;
 			default:
@@ -307,175 +307,175 @@ namespace Microsoft.SqlServer.Server {
 			throw new NotImplementedException ();
 		}
 
-		public SqlMetaData (string name, SqlDbType sqlDbType, byte precision, byte scale)
+		public SqlMetaData (string name, SqlDbType dbType, byte precision, byte scale)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name can not be null");
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Decimal:
 				maxLength = 9;
 				this.precision = precision;
 				this.scale = scale;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Decimal;
+				_dbType = DbType.Decimal;
 				type = typeof (decimal);
 				break;
 			default:
 				throw new ArgumentException ("SqlDbType not supported");
 			}
 			this.name = name;
-			this.sqlDbType = sqlDbType;
+			this._sqlDbType = dbType;
 		}
 
-		public SqlMetaData (string name, SqlDbType sqlDbType, long maxLength, long locale, SqlCompareOptions compareOptions)
+		public SqlMetaData (string name, SqlDbType dbType, long maxLength, long locale, SqlCompareOptions compareOptions)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name can not be null");
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Char:
-				dbType = DbType.AnsiStringFixedLength;
+				_dbType = DbType.AnsiStringFixedLength;
 				type = typeof (char []);
 				break;
 			case SqlDbType.NChar:
-				dbType = DbType.StringFixedLength;
+				_dbType = DbType.StringFixedLength;
 				type = typeof (char []);
 				break;
 			case SqlDbType.NText:
 			case SqlDbType.NVarChar:
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (string);
 				break;
 			case SqlDbType.Text:
 			case SqlDbType.VarChar:
-				dbType = DbType.AnsiString;
+				_dbType = DbType.AnsiString;
 				type = typeof (char []);
 				break;
 			default:
 				throw new ArgumentException ("SqlDbType not supported");
 			}
 			this.compareOptions = compareOptions;
-			this.localeId = locale;
+			this._localeId = locale;
 			this.maxLength = maxLength;
 			this.name = name;
-			this.sqlDbType = sqlDbType;
+			this._sqlDbType = dbType;
 		}
 
-		public SqlMetaData (string name, SqlDbType sqlDbType, string database, string owningSchema, string objectName)
+		public SqlMetaData (string name, SqlDbType dbType, string database, string owningSchema, string objectName)
 		{
 			if ((name == null || objectName == null) && database != null && owningSchema != null)
 				throw new ArgumentNullException ("name can not be null");
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Xml:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				_localeId = 0;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (string);
 				break;
 			default:
 				throw new ArgumentException ("SqlDbType not supported");
 			}
 			this.name = name;
-			this.sqlDbType = sqlDbType;
+			this._sqlDbType = dbType;
 			databaseName = database;
 			this.owningSchema = owningSchema;
 			this.objectName = objectName;
 		}
 
-		public SqlMetaData (string name, SqlDbType sqlDbType, long maxLength, byte precision,
-				    byte scale, long localeId, SqlCompareOptions compareOptions,
+		public SqlMetaData (string name, SqlDbType dbType, long maxLength, byte precision,
+				    byte scale, long locale, SqlCompareOptions compareOptions,
 				    Type userDefinedType)
 		{
 			if (name == null)
 				throw new ArgumentNullException ("name can not be null");
 			this.compareOptions = compareOptions;
-			this.localeId = localeId;
+			this._localeId = locale;
 			this.maxLength = maxLength;
 			this.precision = precision;
 			this.scale = scale;
-			switch (sqlDbType) {
+			switch (dbType) {
 			case SqlDbType.Bit:
 				maxLength = 1;
 				precision = 1;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Boolean;
+				_dbType = DbType.Boolean;
 				type = typeof (bool);
 				break;
 			case SqlDbType.BigInt:
 				maxLength = 8;
 				precision = 19;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int64;
+				_dbType = DbType.Int64;
 				type = typeof (long);
 				break;
 			case SqlDbType.DateTime:
 				maxLength = 8;
 				precision = 23;
 				scale = 3;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.DateTime;
+				_dbType = DbType.DateTime;
 				type = typeof (DateTime);
 				break;
 			case SqlDbType.Decimal:
 				maxLength = 9;
 				precision = 18;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Decimal;
+				_dbType = DbType.Decimal;
 				type = typeof (decimal);
 				break;
 			case SqlDbType.Float:
 				maxLength = 8;
 				precision = 53;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Decimal;
+				_dbType = DbType.Decimal;
 				type = typeof (float);
 				break;
 			case SqlDbType.Image:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Binary;
+				_dbType = DbType.Binary;
 				type = typeof (byte []);
 				break;
 			case SqlDbType.Int:
 				maxLength = 4;
 				precision = 10;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int32;
+				_dbType = DbType.Int32;
 				type = typeof (int);
 				break;
 			case SqlDbType.Money:
 				maxLength = 8;
 				precision = 19;
 				scale = 4;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Currency;
+				_dbType = DbType.Currency;
 				type = typeof (decimal);
 				break;
 			case SqlDbType.NText:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				locale = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.String;
+				_dbType = DbType.String;
 				type = typeof (string);
 				break;
 			  /*
@@ -491,99 +491,99 @@ namespace Microsoft.SqlServer.Server {
 				maxLength = 4;
 				precision = 24;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Single;
+				_dbType = DbType.Single;
 				type = typeof (Single);
 				break;
 			case SqlDbType.SmallDateTime:
 				maxLength = 4;
 				precision = 16;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.DateTime;
+				_dbType = DbType.DateTime;
 				type = typeof (DateTime);
 				break;
 			case SqlDbType.SmallInt:
 				maxLength = 2;
 				precision = 5;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int16;
+				_dbType = DbType.Int16;
 				type = typeof (short);
 				break;
 			case SqlDbType.SmallMoney:
 				maxLength = 4;
 				precision = 10;
 				scale = 4;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Currency;
+				_dbType = DbType.Currency;
 				type = typeof (decimal);
 				break;
 			case SqlDbType.Text:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = Thread.CurrentThread.CurrentCulture.LCID;
+				locale = Thread.CurrentThread.CurrentCulture.LCID;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.AnsiString;
+				_dbType = DbType.AnsiString;
 				type = typeof (char []);
 				break;
 			case SqlDbType.Timestamp:
 				maxLength = 8;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Byte;
+				_dbType = DbType.Byte;
 				type = typeof (byte []);
 				break;
 			case SqlDbType.TinyInt:
 				maxLength = 1;
 				precision = 3;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Int16;
+				_dbType = DbType.Int16;
 				type = typeof (short);
 				break;
 			case SqlDbType.UniqueIdentifier:
 				maxLength = 16;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Guid;
+				_dbType = DbType.Guid;
 				type = typeof (Guid);
 				break;
 			case SqlDbType.Udt:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Object;
+				_dbType = DbType.Object;
 				type = typeof (object);
 				break;
 			case SqlDbType.Variant:
 				maxLength = 8016;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.None;
-				dbType = DbType.Object;
+				_dbType = DbType.Object;
 				type = typeof (object);
 				break;
 			case SqlDbType.Xml:
 				maxLength = -1;
 				precision = 0;
 				scale = 0;
-				localeId = 0;
+				locale = 0;
 				compareOptions = SqlCompareOptions.IgnoreCase | SqlCompareOptions.IgnoreKanaType | SqlCompareOptions.IgnoreWidth;
-				dbType = DbType.Xml;
+				_dbType = DbType.Xml;
 				type = typeof (string);
 				break;
 			default:
@@ -600,7 +600,7 @@ namespace Microsoft.SqlServer.Server {
 					throw new ArgumentException ("SqlDbType not supported");
 			}
 			this.name = name;
-			this.sqlDbType = sqlDbType;
+			this._sqlDbType = dbType;
 		}
 
 		#endregion // Constructors
@@ -612,11 +612,11 @@ namespace Microsoft.SqlServer.Server {
 		}
 
 		public DbType DbType {
-			get { return dbType; }
+			get { return _dbType; }
 		}
 
 		public long LocaleId {
-			get { return localeId; }
+			get { return _localeId; }
 		}
 
 		public static long Max {
@@ -640,7 +640,7 @@ namespace Microsoft.SqlServer.Server {
 		}
 
 		public SqlDbType SqlDbType {
-			get { return sqlDbType; }
+			get { return _sqlDbType; }
 		}
 
 		public string XmlSchemaCollectionDatabase {
diff --git a/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs b/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs
index debe4587c3e..a38f13a9622 100644
--- a/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs
+++ b/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedAggregateAttribute.cs
@@ -54,9 +54,9 @@ namespace Microsoft.SqlServer.Server {
 
 		#region Constructors
 
-		public SqlUserDefinedAggregateAttribute (Format f)
+		public SqlUserDefinedAggregateAttribute (Format format)
 		{
-			format = f;
+			this.format = format;
 			IsInvariantToDuplicates = false;
 			IsInvariantToNulls = false;
 			IsInvariantToOrder = false;
diff --git a/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs b/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs
index ecb474d9ca5..79a02f7cdd5 100644
--- a/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs
+++ b/mcs/class/System.Data/Microsoft.SqlServer.Server/SqlUserDefinedTypeAttribute.cs
@@ -52,9 +52,9 @@ namespace Microsoft.SqlServer.Server {
 
 		#region Constructors
 
-		public SqlUserDefinedTypeAttribute (Format f)
+		public SqlUserDefinedTypeAttribute (Format format)
 		{
-			format = f;
+			this.format = format;
 			IsByteOrdered = false;
 			IsFixedLength = false;
 			MaxByteSize = MaxByteSizeValue;
diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
index 3e5d1c5d750..591a746a567 100644
--- a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
@@ -81,20 +81,20 @@ namespace System.Data.Common
 #endif 
 		}
 
-		protected DataAdapter (DataAdapter adapter)
+		protected DataAdapter (DataAdapter from)
 		{
-			AcceptChangesDuringFill = adapter.AcceptChangesDuringFill;
-			ContinueUpdateOnError = adapter.ContinueUpdateOnError;
-			MissingMappingAction = adapter.MissingMappingAction;
-			MissingSchemaAction = adapter.MissingSchemaAction;
+			AcceptChangesDuringFill = from.AcceptChangesDuringFill;
+			ContinueUpdateOnError = from.ContinueUpdateOnError;
+			MissingMappingAction = from.MissingMappingAction;
+			MissingSchemaAction = from.MissingSchemaAction;
 
-			if (adapter.tableMappings != null)
-				foreach (ICloneable cloneable in adapter.TableMappings)
+			if (from.tableMappings != null)
+				foreach (ICloneable cloneable in from.TableMappings)
 					TableMappings.Add (cloneable.Clone ());
 #if NET_2_0
-			acceptChangesDuringUpdate = adapter.AcceptChangesDuringUpdate;
-			fillLoadOption = adapter.FillLoadOption;
-			returnProviderSpecificTypes = adapter.ReturnProviderSpecificTypes;
+			acceptChangesDuringUpdate = from.AcceptChangesDuringUpdate;
+			fillLoadOption = from.FillLoadOption;
+			returnProviderSpecificTypes = from.ReturnProviderSpecificTypes;
 #endif 
 		}
 
diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
index eb8d74f5590..22e6f1338e6 100644
--- a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
@@ -195,9 +195,9 @@ namespace System.Data.Common
 		}
 
 #if NET_2_0
-		public void CopyTo (DataColumnMapping [] arr, int index)
+		public void CopyTo (DataColumnMapping [] array, int index)
 		{
-			list.CopyTo (arr, index);
+			list.CopyTo (array, index);
 		}
 #endif
 
@@ -291,11 +291,11 @@ namespace System.Data.Common
 		}
 
 #if NET_2_0
-		public void Insert (int index, DataColumnMapping mapping)
+		public void Insert (int index, DataColumnMapping value)
 		{
-			list.Insert (index, mapping);
-			sourceColumns [mapping.SourceColumn] = mapping;
-			dataSetColumns [mapping.DataSetColumn] = mapping;
+			list.Insert (index, value);
+			sourceColumns [value.SourceColumn] = value;
+			dataSetColumns [value.DataSetColumn] = value;
 		}
 #endif
 
diff --git a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
index bf5e54a6caf..ae3262f24da 100644
--- a/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbCommandBuilder.cs
@@ -565,11 +565,11 @@ namespace System.Data.Common {
 			return GetDeleteCommand (false);
 		}
 
-		public DbCommand GetDeleteCommand (bool option)
+		public DbCommand GetDeleteCommand (bool useColumnsForParameterNames)
 		{
 			BuildCache (true);
-			if (_deleteCommand == null || option)
-				return CreateDeleteCommand (option);
+			if (_deleteCommand == null || useColumnsForParameterNames)
+				return CreateDeleteCommand (useColumnsForParameterNames);
 			return _deleteCommand;
 		}
 
@@ -578,16 +578,16 @@ namespace System.Data.Common {
 			return GetInsertCommand (false, null);
 		}
 
-		public DbCommand GetInsertCommand (bool option)
+		public DbCommand GetInsertCommand (bool useColumnsForParameterNames)
 		{
-			return GetInsertCommand (option, null);
+			return GetInsertCommand (useColumnsForParameterNames, null);
 		}
 
-		internal DbCommand GetInsertCommand (bool option, DataRow row)
+		internal DbCommand GetInsertCommand (bool useColumnsForParameterNames, DataRow row)
 		{
 			BuildCache (true);
-			if (_insertCommand == null || option)
-				return CreateInsertCommand (option, row);
+			if (_insertCommand == null || useColumnsForParameterNames)
+				return CreateInsertCommand (useColumnsForParameterNames, row);
 			return _insertCommand;
 		}
 
@@ -596,11 +596,11 @@ namespace System.Data.Common {
 			return GetUpdateCommand (false);
 		}
 
-		public DbCommand GetUpdateCommand (bool option)
+		public DbCommand GetUpdateCommand (bool useColumnsForParameterNames)
 		{
 			BuildCache (true);
-			if (_updateCommand == null || option)
-				return CreateUpdateCommand (option);
+			if (_updateCommand == null || useColumnsForParameterNames)
+				return CreateUpdateCommand (useColumnsForParameterNames);
 			return _updateCommand;
 		}
 
@@ -647,25 +647,25 @@ namespace System.Data.Common {
 			_insertCommand = null;
 		}
 
-		protected void RowUpdatingHandler (RowUpdatingEventArgs args)
+		protected void RowUpdatingHandler (RowUpdatingEventArgs rowUpdatingEvent)
 		{
-			if (args.Command != null)
+			if (rowUpdatingEvent.Command != null)
 				return;
 			try {
-				switch (args.StatementType) {
+				switch (rowUpdatingEvent.StatementType) {
 				case StatementType.Insert:
-					args.Command = GetInsertCommand (false, args.Row);
+					rowUpdatingEvent.Command = GetInsertCommand (false, rowUpdatingEvent.Row);
 					break;
 				case StatementType.Update:
-					args.Command = GetUpdateCommand ();
+					rowUpdatingEvent.Command = GetUpdateCommand ();
 					break;
 				case StatementType.Delete:
-					args.Command = GetDeleteCommand ();
+					rowUpdatingEvent.Command = GetDeleteCommand ();
 					break;
 				}
 			} catch (Exception e) {
-				args.Errors = e;
-				args.Status = UpdateStatus.ErrorsOccurred;
+				rowUpdatingEvent.Errors = e;
+				rowUpdatingEvent.Status = UpdateStatus.ErrorsOccurred;
 			}
 		}
 
@@ -675,9 +675,9 @@ namespace System.Data.Common {
 
 		protected abstract void SetRowUpdatingHandler (DbDataAdapter adapter);
 
-		protected virtual DataTable GetSchemaTable (DbCommand cmd)
+		protected virtual DataTable GetSchemaTable (DbCommand sourceCommand)
 		{
-			using (DbDataReader rdr = cmd.ExecuteReader ())
+			using (DbDataReader rdr = sourceCommand.ExecuteReader ())
 				return rdr.GetSchemaTable ();
 		}
 
diff --git a/mcs/class/System.Data/System.Data.Common/DbConnection.cs b/mcs/class/System.Data/System.Data.Common/DbConnection.cs
index 1bbc6797c92..dad77673bbc 100644
--- a/mcs/class/System.Data/System.Data.Common/DbConnection.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbConnection.cs
@@ -743,10 +743,10 @@ namespace System.Data.Common {
 		
 		public abstract void Open ();
 
-		protected virtual void OnStateChange (StateChangeEventArgs stateChanged)
+		protected virtual void OnStateChange (StateChangeEventArgs stateChange)
 		{
 			if (StateChange != null)
-				StateChange (this, stateChanged);
+				StateChange (this, stateChange);
 		}
 
 		#endregion // Methods
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
index 7d046978a41..b7eac3ee159 100644
--- a/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbDataReader.cs
@@ -53,7 +53,7 @@ namespace System.Data.Common {
 		public abstract int FieldCount { get; }
 		public abstract bool HasRows { get; }
 		public abstract bool IsClosed { get; }
-		public abstract object this [int index] { get; }
+		public abstract object this [int ordinal] { get; }
 		public abstract object this [string name] { get; }
 		public abstract int RecordsAffected { get; }
 
@@ -67,11 +67,11 @@ namespace System.Data.Common {
 		#region Methods
 
 		public abstract void Close ();
-		public abstract bool GetBoolean (int i);
-		public abstract byte GetByte (int i);
-		public abstract long GetBytes (int i, long fieldOffset, byte[] buffer, int bufferOffset, int length);
-		public abstract char GetChar (int i);
-		public abstract long GetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length);
+		public abstract bool GetBoolean (int ordinal);
+		public abstract byte GetByte (int ordinal);
+		public abstract long GetBytes (int ordinal, long dataOffset, byte[] buffer, int bufferOffset, int length);
+		public abstract char GetChar (int ordinal);
+		public abstract long GetChars (int ordinal, long dataOffset, char[] buffer, int bufferOffset, int length);
 
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		public void Dispose ()
@@ -86,40 +86,40 @@ namespace System.Data.Common {
 		}
 #if NET_2_0
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public DbDataReader GetData (int i)
+		public DbDataReader GetData (int ordinal)
 		{
-			return ((DbDataReader) this [i]);
+			return ((DbDataReader) this [ordinal]);
 		}
 #endif
 
-		public abstract string GetDataTypeName (int i);
-		public abstract DateTime GetDateTime (int i);
-		public abstract decimal GetDecimal (int i);
-		public abstract double GetDouble (int i);
+		public abstract string GetDataTypeName (int ordinal);
+		public abstract DateTime GetDateTime (int ordinal);
+		public abstract decimal GetDecimal (int ordinal);
+		public abstract double GetDouble (int ordinal);
 
 		[EditorBrowsable (EditorBrowsableState.Never)]
 		public abstract IEnumerator GetEnumerator ();
 
-		public abstract Type GetFieldType (int i);
-		public abstract float GetFloat (int i);
-		public abstract Guid GetGuid (int i);
-		public abstract short GetInt16 (int i);
-		public abstract int GetInt32 (int i);
-		public abstract long GetInt64 (int i);
-		public abstract string GetName (int i);
+		public abstract Type GetFieldType (int ordinal);
+		public abstract float GetFloat (int ordinal);
+		public abstract Guid GetGuid (int ordinal);
+		public abstract short GetInt16 (int ordinal);
+		public abstract int GetInt32 (int ordinal);
+		public abstract long GetInt64 (int ordinal);
+		public abstract string GetName (int ordinal);
 		public abstract int GetOrdinal (string name);
 
 #if NET_2_0
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public virtual Type GetProviderSpecificFieldType (int i)
+		public virtual Type GetProviderSpecificFieldType (int ordinal)
 		{
-			return GetFieldType (i);
+			return GetFieldType (ordinal);
 		}
 
 		[EditorBrowsable (EditorBrowsableState.Never)]
-		public virtual object GetProviderSpecificValue (int i)
+		public virtual object GetProviderSpecificValue (int ordinal)
 		{
-			return GetValue (i);
+			return GetValue (ordinal);
 		}
 
 		[EditorBrowsable (EditorBrowsableState.Never)]
@@ -135,16 +135,16 @@ namespace System.Data.Common {
 #endif 
 
 		public abstract DataTable GetSchemaTable ();
-		public abstract string GetString (int i);
-		public abstract object GetValue (int i);
+		public abstract string GetString (int ordinal);
+		public abstract object GetValue (int ordinal);
 		public abstract int GetValues (object[] values);
 
-		IDataReader IDataRecord.GetData (int i)
+		IDataReader IDataRecord.GetData (int ordinal)
 		{
-			return ((IDataReader) this).GetData (i);
+			return ((IDataReader) this).GetData (ordinal);
 		}
 
-		public abstract bool IsDBNull (int i);
+		public abstract bool IsDBNull (int ordinal);
 		public abstract bool NextResult ();
 		public abstract bool Read ();
 
diff --git a/mcs/class/System.Data/System.Data.Common/DbException.cs b/mcs/class/System.Data/System.Data.Common/DbException.cs
index b5e41618192..e19bbfb60a8 100644
--- a/mcs/class/System.Data/System.Data.Common/DbException.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbException.cs
@@ -55,7 +55,7 @@ namespace System.Data.Common {
 		{
 		}
 
-		protected DbException (string message, int errorcode) : base(message,errorcode) 
+		protected DbException (string message, int errorCode) : base(message,errorCode) 
 		{
 		}
 	}
diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
index 2ff951e506f..613cbe42c08 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcCommandBuilder.cs
@@ -578,17 +578,17 @@ namespace System.Data.Odbc
 
 #if NET_2_0
 		protected override void ApplyParameterInfo (DbParameter parameter,
-		                                            DataRow row,
+		                                            DataRow datarow,
 		                                            StatementType statementType,
 		                                            bool whereClause)
 		{
 			OdbcParameter odbcParam = (OdbcParameter) parameter;
-			odbcParam.Size = int.Parse (row ["ColumnSize"].ToString ());
-			if (row ["NumericPrecision"] != DBNull.Value)
-				odbcParam.Precision = byte.Parse (row ["NumericPrecision"].ToString ());
-			if (row ["NumericScale"] != DBNull.Value)
-				odbcParam.Scale = byte.Parse (row ["NumericScale"].ToString ());
-			odbcParam.DbType = (DbType) row ["ProviderType"];
+			odbcParam.Size = int.Parse (datarow ["ColumnSize"].ToString ());
+			if (datarow ["NumericPrecision"] != DBNull.Value)
+				odbcParam.Precision = byte.Parse (datarow ["NumericPrecision"].ToString ());
+			if (datarow ["NumericScale"] != DBNull.Value)
+				odbcParam.Scale = byte.Parse (datarow ["NumericScale"].ToString ());
+			odbcParam.DbType = (DbType) datarow ["ProviderType"];
 		}
 
 		protected override string GetParameterName (string parameterName)
diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs
index 48942ac1ac2..5ae8bc4ce50 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs
@@ -110,14 +110,14 @@ namespace System.Data.Odbc
 		}
 
 #if NET_2_0
-		public void CopyTo (OdbcError [] array, int index)
+		public void CopyTo (OdbcError [] array, int i)
 		{
 			if (array == null)
 				throw new ArgumentNullException ("array");
 
-			if ((index < array.GetLowerBound (0)) || (index > array.GetUpperBound (0)))
+			if ((i < array.GetLowerBound (0)) || (i > array.GetUpperBound (0)))
 				throw new ArgumentOutOfRangeException ("index");
-			((OdbcError[]) (_items.ToArray ())).CopyTo (array, index);
+			((OdbcError[]) (_items.ToArray ())).CopyTo (array, i);
 		}
 #endif
 
diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
index a7fc66f7c79..d258bc8a42b 100644
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
@@ -345,9 +345,9 @@ namespace System.Data.Odbc
 		}
 
 #if NET_2_0
-		protected override DbParameter GetParameter (string name)
+		protected override DbParameter GetParameter (string parameterName)
 		{
-			return this [name];
+			return this [parameterName];
 		}
 
 		protected override DbParameter GetParameter (int index)
@@ -355,9 +355,9 @@ namespace System.Data.Odbc
 			return this [index];
 		}
 
-		protected override void SetParameter (string name, DbParameter value)
+		protected override void SetParameter (string parameterName, DbParameter value)
 		{
-			this [name] = (OdbcParameter) value;
+			this [parameterName] = (OdbcParameter) value;
 		}
 
 		protected override void SetParameter (int index, DbParameter value)
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
index 93a15db03aa..6346d5d392b 100644
--- a/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
@@ -128,20 +128,20 @@ namespace System.Data.OleDb
 		#region Methods
 
 #if NET_2_0
-		protected override void ApplyParameterInfo (DbParameter dbParameter,
-				                                    DataRow row,
+		protected override void ApplyParameterInfo (DbParameter parameter,
+				                                    DataRow datarow,
 				                                    StatementType statementType,
 				                                    bool whereClause)
 		{
-			OleDbParameter parameter = (OleDbParameter) dbParameter;
-			parameter.Size = int.Parse (row ["ColumnSize"].ToString ());
-			if (row ["NumericPrecision"] != DBNull.Value) {
-				parameter.Precision = byte.Parse (row ["NumericPrecision"].ToString ());
+			OleDbParameter p = (OleDbParameter) parameter;
+			p.Size = int.Parse (datarow ["ColumnSize"].ToString ());
+			if (datarow ["NumericPrecision"] != DBNull.Value) {
+				p.Precision = byte.Parse (datarow ["NumericPrecision"].ToString ());
 			}
-			if (row ["NumericScale"] != DBNull.Value) {
-				parameter.Scale = byte.Parse (row ["NumericScale"].ToString ());
+			if (datarow ["NumericScale"] != DBNull.Value) {
+				p.Scale = byte.Parse (datarow ["NumericScale"].ToString ());
 			}
-			parameter.DbType = (DbType) row ["ProviderType"];
+			p.DbType = (DbType) datarow ["ProviderType"];
 		}
 #endif
 
@@ -205,9 +205,9 @@ namespace System.Data.OleDb
 			throw new NotImplementedException ();
 		}
 
-		protected override string GetParameterName (int position)
+		protected override string GetParameterName (int parameterOrdinal)
 		{
-			return String.Format("@p{0}", position);
+			return String.Format("@p{0}", parameterOrdinal);
 		}
 
 		protected override string GetParameterName (string parameterName)
@@ -215,9 +215,9 @@ namespace System.Data.OleDb
 			return String.Format("@{0}", parameterName);                       
 		}
                 
-		protected override string GetParameterPlaceholder (int position)
+		protected override string GetParameterPlaceholder (int parameterOrdinal)
 		{
-			return GetParameterName (position);
+			return GetParameterName (parameterOrdinal);
 		}
                 
 #endif
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlAlreadyFilledException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlAlreadyFilledException.cs
index 7fdf6b6a01d..46757d42638 100644
--- a/mcs/class/System.Data/System.Data.SqlTypes/SqlAlreadyFilledException.cs
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlAlreadyFilledException.cs
@@ -47,8 +47,8 @@ namespace System.Data.SqlTypes {
 		{
 		}
 
-		public SqlAlreadyFilledException (string message, Exception inner)
-			: base (message, inner)
+		public SqlAlreadyFilledException (string message, Exception e)
+			: base (message, e)
 		{
 		}
 
diff --git a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
index 78d408acf6e..f556a9c93bb 100644
--- a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
+++ b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
@@ -108,7 +108,7 @@ namespace System.Data
 		}
 
 		[MonoTODO]
-		public void CopyToRows (DataRow [] array, int ArrayIndex)
+		public void CopyToRows (DataRow [] array, int arrayIndex)
 		{
 			throw new NotImplementedException ();
 		}
diff --git a/mcs/class/System.Data/System.Data/DataRelation.cs b/mcs/class/System.Data/System.Data/DataRelation.cs
index 89076a3357c..923f1799526 100644
--- a/mcs/class/System.Data/System.Data/DataRelation.cs
+++ b/mcs/class/System.Data/System.Data/DataRelation.cs
@@ -138,15 +138,15 @@ namespace System.Data
 #if NET_2_0
 		[Browsable (false)]
 		public DataRelation (string relationName, string parentTableName,
-				     string parentTableNameSpace, string childTableName,
-				     string childTableNameSpace, string[] parentColumnNames,
+				     string parentTableNamespace, string childTableName,
+				     string childTableNamespace, string[] parentColumnNames,
 				     string[] childColumnNames, bool nested)
 		{
 			_relationName = relationName;
 			_parentTableName = parentTableName;
-			_parentTableNameSpace = parentTableNameSpace;
+			_parentTableNameSpace = parentTableNamespace;
 			_childTableName = childTableName;
-			_childTableNameSpace = childTableNameSpace;
+			_childTableNameSpace = childTableNamespace;
 			_parentColumnNames = parentColumnNames;
 			_childColumnNames = childColumnNames;
 			_nested = nested;
diff --git a/mcs/class/System.Data/System.Data/DataRowCollection.cs b/mcs/class/System.Data/System.Data/DataRowCollection.cs
index fbbc7e932ba..abd8126d092 100644
--- a/mcs/class/System.Data/System.Data/DataRowCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataRowCollection.cs
@@ -338,9 +338,9 @@ namespace System.Data
 			CopyTo ((Array) array, index);
 		}
 
-		public override void CopyTo (Array array, int index)
+		public override void CopyTo (Array ar, int index)
 		{
-			base.CopyTo (array, index);
+			base.CopyTo (ar, index);
 		}
 
 		public override IEnumerator GetEnumerator ()
diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index 9d6b56d68c5..573ab1bf7da 100644
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1552,7 +1552,7 @@ namespace System.Data
 		private bool dataSetInitialized = true;

 		public event EventHandler Initialized;

 

-		protected DataSet (SerializationInfo info, StreamingContext context, bool constructSchema)

+		protected DataSet (SerializationInfo info, StreamingContext context, bool ConstructSchema)

 			: this ()

 		{

 			if (DetermineSchemaSerializationMode (info, context) == SchemaSerializationMode.ExcludeSchema) {

@@ -1564,7 +1564,7 @@ namespace System.Data
 				return;

 			}

 			

-			if (constructSchema) {

+			if (ConstructSchema) {

 				string s = info.GetValue ("XmlSchema", typeof (String)) as String;

 				XmlTextReader reader = new XmlTextReader (new StringReader (s));

 				ReadXmlSchema (reader);

diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs
index 551da284b54..36036b2e2ae 100644
--- a/mcs/class/System.Data/System.Data/DataTable.cs
+++ b/mcs/class/System.Data/System.Data/DataTable.cs
@@ -2368,10 +2368,10 @@ namespace System.Data {
 	}

 

 	partial class DataTable {

-		public DataTable (string tableName, string tbNamespace)

+		public DataTable (string tableName, string tableNamespace)

 			: this (tableName)

 		{

-			_nameSpace = tbNamespace;

+			_nameSpace = tableNamespace;

 		}

 

 		SerializationFormat remotingFormat = SerializationFormat.Xml;

diff --git a/mcs/class/System.Data/System.Data/DataTableClearEventArgs.cs b/mcs/class/System.Data/System.Data/DataTableClearEventArgs.cs
index 0af251926d7..d4e301e4be9 100644
--- a/mcs/class/System.Data/System.Data/DataTableClearEventArgs.cs
+++ b/mcs/class/System.Data/System.Data/DataTableClearEventArgs.cs
@@ -40,9 +40,9 @@ namespace System.Data
                 #endregion //Fields
 
                 #region Constructors
-                public DataTableClearEventArgs(DataTable table) 
+                public DataTableClearEventArgs(DataTable dataTable) 
                 {
-                        _table = table;
+                        _table = dataTable;
                 }
                 #endregion // Constructors
 
diff --git a/mcs/class/System.Data/System.Data/DataTableCollection.cs b/mcs/class/System.Data/System.Data/DataTableCollection.cs
index b4537e4c6f0..21204a5d568 100644
--- a/mcs/class/System.Data/System.Data/DataTableCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataTableCollection.cs
@@ -372,16 +372,16 @@ namespace System.Data
 
 #if NET_2_0
 	sealed partial class DataTableCollection {
-		public DataTable this [string name, string tbNamespace] {
+		public DataTable this [string name, string tableNamespace] {
 			get {
-				int index = IndexOf (name, tbNamespace, true);
+				int index = IndexOf (name, tableNamespace, true);
 				return index < 0 ? null : (DataTable) List [index];
 			}
 		}
 
-		public DataTable Add (string name, string tbNamespace)
+		public DataTable Add (string name, string tableNamespace)
 		{
-			DataTable table = new DataTable (name, tbNamespace);
+			DataTable table = new DataTable (name, tableNamespace);
 			this.Add (table);
 			return table;
 		}
diff --git a/mcs/class/System.Data/System.Data/DataTableNewRowEventArgs.cs b/mcs/class/System.Data/System.Data/DataTableNewRowEventArgs.cs
index 88d64cc7cdc..99a67f277c8 100644
--- a/mcs/class/System.Data/System.Data/DataTableNewRowEventArgs.cs
+++ b/mcs/class/System.Data/System.Data/DataTableNewRowEventArgs.cs
@@ -40,9 +40,9 @@ namespace System.Data
 		#endregion //Fields
 
                 #region Constructors
-                public DataTableNewRowEventArgs(DataRow row)
+                public DataTableNewRowEventArgs(DataRow dataRow)
                 {
-                        _row = row;
+                        _row = dataRow;
 		}
 		#endregion // Constructors
 
diff --git a/mcs/class/System.Data/System.Data/DataTableReader.cs b/mcs/class/System.Data/System.Data/DataTableReader.cs
index a1b5ac11daa..cf0faca9374 100644
--- a/mcs/class/System.Data/System.Data/DataTableReader.cs
+++ b/mcs/class/System.Data/System.Data/DataTableReader.cs
@@ -52,8 +52,8 @@ namespace System.Data {
 
 		#region Constructors
 
-		public DataTableReader (DataTable dt)
-			: this (new DataTable[] {dt})
+		public DataTableReader (DataTable dataTable)
+			: this (new DataTable[] {dataTable})
 		{
 		}
 
@@ -96,15 +96,15 @@ namespace System.Data {
 			get { return _closed; }
 		}
 
-		public override object this [int index] {
+		public override object this [int ordinal] {
 			get {
 				Validate ();
-				if (index < 0 || index >= FieldCount)
-					throw new ArgumentOutOfRangeException ("index " + index + " is not in the range");
+				if (ordinal < 0 || ordinal >= FieldCount)
+					throw new ArgumentOutOfRangeException ("index " + ordinal + " is not in the range");
 				DataRow row = CurrentRow;
 				if (row.RowState == DataRowState.Deleted)
 					throw new InvalidOperationException ("Deleted Row's information cannot be accessed!");
-				return row [index];
+				return row [ordinal];
 			}
 		}
 
@@ -170,21 +170,21 @@ namespace System.Data {
 			_closed = true;
 		}
 
-		public override bool GetBoolean (int i)
+		public override bool GetBoolean (int ordinal)
 		{
-			return (bool) GetValue (i);
+			return (bool) GetValue (ordinal);
 		}
 
-		public override byte GetByte (int i)
+		public override byte GetByte (int ordinal)
 		{
-			return (byte) GetValue (i);
+			return (byte) GetValue (ordinal);
 		}
 
-		public override long GetBytes (int i, long dataIndex, byte[] buffer, int bufferIndex, int length)
+		public override long GetBytes (int ordinal, long dataIndex, byte[] buffer, int bufferIndex, int length)
 		{
-			byte[] value = this [i] as byte[];
+			byte[] value = this [ordinal] as byte[];
 			if (value == null)
-				ThrowInvalidCastException (this [i].GetType (), typeof (byte[]));
+				ThrowInvalidCastException (this [ordinal].GetType (), typeof (byte[]));
 			if (buffer == null)
 				return value.Length;
 			int copylen = length > value.Length ? value.Length : length;
@@ -192,16 +192,16 @@ namespace System.Data {
 			return copylen;
 		}
 
-		public override char GetChar (int i)
+		public override char GetChar (int ordinal)
 		{
-			return (char) GetValue (i);
+			return (char) GetValue (ordinal);
 		}
 
-		public override long GetChars (int i, long dataIndex, char[] buffer, int bufferIndex, int length)
+		public override long GetChars (int ordinal, long dataIndex, char[] buffer, int bufferIndex, int length)
 		{
-			char[] value = this [i] as char[];
+			char[] value = this [ordinal] as char[];
 			if (value == null)
-				ThrowInvalidCastException (this [i].GetType (), typeof (char[]));
+				ThrowInvalidCastException (this [ordinal].GetType (), typeof (char[]));
 			if (buffer == null)
 				return value.Length;
 			int copylen = length > value.Length ? value.Length : length;
@@ -209,24 +209,24 @@ namespace System.Data {
 			return copylen;
 		}
 
-		public override string GetDataTypeName (int i)
+		public override string GetDataTypeName (int ordinal)
 		{
-			return GetFieldType (i).ToString ();
+			return GetFieldType (ordinal).ToString ();
 		}
 
-		public override DateTime GetDateTime (int i)
+		public override DateTime GetDateTime (int ordinal)
 		{
-			return (DateTime) GetValue (i);
+			return (DateTime) GetValue (ordinal);
 		}
 
-		public override decimal GetDecimal (int i)
+		public override decimal GetDecimal (int ordinal)
 		{
-			return (decimal) GetValue (i);
+			return (decimal) GetValue (ordinal);
 		}
 
-		public override double GetDouble (int i)
+		public override double GetDouble (int ordinal)
 		{
-			return (double) GetValue (i);
+			return (double) GetValue (ordinal);
 		}
 
 		public override IEnumerator GetEnumerator ()
@@ -234,46 +234,46 @@ namespace System.Data {
 			return new DbEnumerator (this);
 		}
 
-		public override Type GetProviderSpecificFieldType (int i)
+		public override Type GetProviderSpecificFieldType (int ordinal)
 		{
-			return GetFieldType (i);
+			return GetFieldType (ordinal);
 		}
 
-		public override Type GetFieldType (int i)
+		public override Type GetFieldType (int ordinal)
 		{
 			ValidateClosed ();
-			return CurrentTable.Columns [i].DataType;
+			return CurrentTable.Columns [ordinal].DataType;
 		}
 
-		public override float GetFloat (int i)
+		public override float GetFloat (int ordinal)
 		{
-			return (float) GetValue (i);
+			return (float) GetValue (ordinal);
 		}
 
-		public override Guid GetGuid (int i)
+		public override Guid GetGuid (int ordinal)
 		{
-			return (Guid) GetValue (i);
+			return (Guid) GetValue (ordinal);
 		}
 
-		public override short GetInt16 (int i)
+		public override short GetInt16 (int ordinal)
 		{
-			return (short) GetValue (i);
+			return (short) GetValue (ordinal);
 		}
 
-		public override int GetInt32 (int i)
+		public override int GetInt32 (int ordinal)
 		{
-			return (int) GetValue (i);
+			return (int) GetValue (ordinal);
 		}
 
-		public override long GetInt64 (int i)
+		public override long GetInt64 (int ordinal)
 		{
-			return (long) GetValue (i);
+			return (long) GetValue (ordinal);
 		}
 
-		public override string GetName (int i)
+		public override string GetName (int ordinal)
 		{
 			ValidateClosed ();
-			return CurrentTable.Columns [i].ColumnName;
+			return CurrentTable.Columns [ordinal].ColumnName;
 		}
 
 		public override int GetOrdinal (string name)
@@ -285,9 +285,9 @@ namespace System.Data {
 			return index;
 		}
 
-		public override object GetProviderSpecificValue (int i)
+		public override object GetProviderSpecificValue (int ordinal)
 		{
-			return GetValue (i);
+			return GetValue (ordinal);
 		}
 
 		public override int GetProviderSpecificValues (object[] values)
@@ -295,14 +295,14 @@ namespace System.Data {
 			return GetValues (values);
 		}
 
-		public override string GetString (int i)
+		public override string GetString (int ordinal)
 		{
-			return (string) GetValue (i);
+			return (string) GetValue (ordinal);
 		}
 
-		public override object GetValue (int i)
+		public override object GetValue (int ordinal)
 		{
-			return this [i];
+			return this [ordinal];
 		}
 
 		public override int GetValues (object[] values)
@@ -317,9 +317,9 @@ namespace System.Data {
 			return count;
 		}
 
-		public override bool IsDBNull (int i)
+		public override bool IsDBNull (int ordinal)
 		{
-			return GetValue (i) is DBNull;
+			return GetValue (ordinal) is DBNull;
 		}
 
 		public override DataTable GetSchemaTable ()
diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs
index ec3903b89e0..102e4f950f0 100644
--- a/mcs/class/System.Data/System.Data/DataView.cs
+++ b/mcs/class/System.Data/System.Data/DataView.cs
@@ -1141,21 +1141,21 @@ namespace System.Data
 	}

 

 	partial class DataView {

-		public virtual bool Equals (DataView dv)

+		public virtual bool Equals (DataView view)

 		{

-			if (this == dv)

+			if (this == view)

 				return true;

-			if (!(this.Table == dv.Table && this.Sort == dv.Sort &&

-				this.RowFilter == dv.RowFilter &&

-				this.RowStateFilter == dv.RowStateFilter &&

-				this.AllowEdit == dv.AllowEdit &&

-				this.AllowNew == dv.AllowNew &&

-				this.AllowDelete == dv.AllowDelete &&

-				this.Count == dv.Count))

+			if (!(this.Table == view.Table && this.Sort == view.Sort &&

+				this.RowFilter == view.RowFilter &&

+				this.RowStateFilter == view.RowStateFilter &&

+				this.AllowEdit == view.AllowEdit &&

+				this.AllowNew == view.AllowNew &&

+				this.AllowDelete == view.AllowDelete &&

+				this.Count == view.Count))

 				return false;

 

 			for (int i = 0; i < Count; ++i)

-				if (!this [i].Equals (dv [i]))

+				if (!this [i].Equals (view [i]))

 					return false;

 			return true;

 		}

@@ -1169,17 +1169,17 @@ namespace System.Data
 			return this.ToTable (tableName, false, new string[] {});

 		}

 

-		public DataTable ToTable (bool isDistinct, params string[] columnNames)

+		public DataTable ToTable (bool distinct, params string[] columnNames)

 		{

-			return this.ToTable (Table.TableName, isDistinct, columnNames);

+			return this.ToTable (Table.TableName, distinct, columnNames);

 		}

 

-		public DataTable ToTable (string tablename, bool isDistinct, params string[] columnNames)

+		public DataTable ToTable (string tableName, bool distinct, params string[] columnNames)

 		{

 			if (columnNames == null)

 				throw new ArgumentNullException ("columnNames", "'columnNames' argument cannot be null.");

 

-			DataTable newTable = new DataTable (tablename);

+			DataTable newTable = new DataTable (tableName);

 

 			DataColumn[] columns;

 			ListSortDirection[] sortDirection = null;

@@ -1225,7 +1225,7 @@ namespace System.Data
 			else

 				index = new Index (new Key(Table, columns, sortDirection, RowStateFilter, rowFilterExpr));

 			

-			if (isDistinct)

+			if (distinct)

 				rows = index.GetDistinctRows ();

 			else

 				rows = index.GetAllRows ();

diff --git a/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs b/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs
index d4dcfe05c88..648efe60900 100644
--- a/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs
+++ b/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public DeletedRowInaccessibleException (string message, Exception inner)
-			: base (message, inner)
+		public DeletedRowInaccessibleException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/DuplicateNameException.cs b/mcs/class/System.Data/System.Data/DuplicateNameException.cs
index ccb7eae6066..ebaaf6ae92a 100644
--- a/mcs/class/System.Data/System.Data/DuplicateNameException.cs
+++ b/mcs/class/System.Data/System.Data/DuplicateNameException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public DuplicateNameException (string message, Exception inner)
-			: base (message, inner)
+		public DuplicateNameException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/EvaluateException.cs b/mcs/class/System.Data/System.Data/EvaluateException.cs
index b9977551cd7..980a1037373 100644
--- a/mcs/class/System.Data/System.Data/EvaluateException.cs
+++ b/mcs/class/System.Data/System.Data/EvaluateException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public EvaluateException (string message, Exception inner)
-			: base (message, inner)
+		public EvaluateException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/InRowChangingEventException.cs b/mcs/class/System.Data/System.Data/InRowChangingEventException.cs
index fd9308e81a3..3fa4e70b858 100644
--- a/mcs/class/System.Data/System.Data/InRowChangingEventException.cs
+++ b/mcs/class/System.Data/System.Data/InRowChangingEventException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public InRowChangingEventException (string message, Exception inner)
-			: base (message, inner)
+		public InRowChangingEventException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/InvalidConstraintException.cs b/mcs/class/System.Data/System.Data/InvalidConstraintException.cs
index 40d96516fe5..f7030523dc7 100644
--- a/mcs/class/System.Data/System.Data/InvalidConstraintException.cs
+++ b/mcs/class/System.Data/System.Data/InvalidConstraintException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public InvalidConstraintException (string message, Exception inner)
-			: base (message, inner)
+		public InvalidConstraintException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/InvalidExpressionException.cs b/mcs/class/System.Data/System.Data/InvalidExpressionException.cs
index a5694be08be..9da5f2ae1a0 100644
--- a/mcs/class/System.Data/System.Data/InvalidExpressionException.cs
+++ b/mcs/class/System.Data/System.Data/InvalidExpressionException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public InvalidExpressionException (string message, Exception inner)
-			: base (message, inner)
+		public InvalidExpressionException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs b/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs
index 6578794314b..c4ce9c3dc08 100644
--- a/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs
+++ b/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public MissingPrimaryKeyException (string message, Exception inner)
-			: base (message, inner)
+		public MissingPrimaryKeyException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/NoNullAllowedException.cs b/mcs/class/System.Data/System.Data/NoNullAllowedException.cs
index d61be7ba5c3..91bd5920688 100644
--- a/mcs/class/System.Data/System.Data/NoNullAllowedException.cs
+++ b/mcs/class/System.Data/System.Data/NoNullAllowedException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public NoNullAllowedException (string message, Exception inner)
-			: base (message, inner)
+		public NoNullAllowedException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/ReadOnlyException.cs b/mcs/class/System.Data/System.Data/ReadOnlyException.cs
index 1599a41d240..3851f1bb4fb 100644
--- a/mcs/class/System.Data/System.Data/ReadOnlyException.cs
+++ b/mcs/class/System.Data/System.Data/ReadOnlyException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public ReadOnlyException (string message, Exception inner)
-			: base (message, inner)
+		public ReadOnlyException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/RowNotInTableException.cs b/mcs/class/System.Data/System.Data/RowNotInTableException.cs
index 7b005b2e0d1..022fa051a77 100644
--- a/mcs/class/System.Data/System.Data/RowNotInTableException.cs
+++ b/mcs/class/System.Data/System.Data/RowNotInTableException.cs
@@ -48,8 +48,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public RowNotInTableException (string message, Exception inner)
-			: base (message, inner)
+		public RowNotInTableException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/SyntaxErrorException.cs b/mcs/class/System.Data/System.Data/SyntaxErrorException.cs
index 16dc730c60d..4f41dd5c5c0 100644
--- a/mcs/class/System.Data/System.Data/SyntaxErrorException.cs
+++ b/mcs/class/System.Data/System.Data/SyntaxErrorException.cs
@@ -53,8 +53,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public SyntaxErrorException (String message, Exception inner)
-			: base (message, inner)
+		public SyntaxErrorException (String message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs b/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs
index 0c08617a385..39a9ab828c6 100644
--- a/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs
+++ b/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs
@@ -64,12 +64,12 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public TypedDataSetGeneratorException (String error) : base (error)
+		public TypedDataSetGeneratorException (String message) : base (message)
 		{
 		}
 		
-		public TypedDataSetGeneratorException (String error, Exception inner) 
-			: base (error, inner)
+		public TypedDataSetGeneratorException (String message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif
diff --git a/mcs/class/System.Data/System.Data/VersionNotFoundException.cs b/mcs/class/System.Data/System.Data/VersionNotFoundException.cs
index 3d2b447f236..9253a24d371 100644
--- a/mcs/class/System.Data/System.Data/VersionNotFoundException.cs
+++ b/mcs/class/System.Data/System.Data/VersionNotFoundException.cs
@@ -53,8 +53,8 @@ namespace System.Data
 		}
 
 #if NET_2_0
-		public VersionNotFoundException (string message, Exception inner)
-			: base (message, inner)
+		public VersionNotFoundException (string message, Exception innerException)
+			: base (message, innerException)
 		{
 		}
 #endif