Code cleanup

48 files changed, 103 insertions, 105 deletions

diff --git a/crypto/test/src/asn1/test/ASN1IntegerTest.cs b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
index 0e37a7e10..c11a099bf 100644
--- a/crypto/test/src/asn1/test/ASN1IntegerTest.cs
+++ b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
@@ -339,12 +339,12 @@ namespace Org.BouncyCastle.Asn1.Tests
                 CheckArgumentException(e, "malformed integer");
             }
         }
-        private void CheckArgumentException(ArgumentException e, String expectedMessage)
+        private void CheckArgumentException(ArgumentException e, string expectedMessage)
         {
             IsTrue(e.Message.StartsWith(expectedMessage));
         }
 
-        private void CheckArgumentException(String errorText, ArgumentException e, String expectedMessage)
+        private void CheckArgumentException(string errorText, ArgumentException e, string expectedMessage)
         {
             IsTrue(errorText, e.Message.StartsWith(expectedMessage));
         }
diff --git a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs b/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs
index b7246193b..7e92fc02f 100644
--- a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs
+++ b/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs
@@ -24,7 +24,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				AdditionalInformationSyntax.GetInstance(new Object());
+				AdditionalInformationSyntax.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs b/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs
index 8d0a1f821..0a454f6a9 100644
--- a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs
+++ b/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs
@@ -37,7 +37,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				AdmissionSyntax.GetInstance(new Object());
+				AdmissionSyntax.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs b/crypto/test/src/asn1/test/AdmissionsUnitTest.cs
index edefeb830..8d65258ee 100644
--- a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs
+++ b/crypto/test/src/asn1/test/AdmissionsUnitTest.cs
@@ -34,7 +34,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				Admissions.GetInstance(new Object());
+				Admissions.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/CertHashUnitTest.cs b/crypto/test/src/asn1/test/CertHashUnitTest.cs
index 1e271a9c0..d3311a9ad 100644
--- a/crypto/test/src/asn1/test/CertHashUnitTest.cs
+++ b/crypto/test/src/asn1/test/CertHashUnitTest.cs
@@ -36,7 +36,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				CertHash.GetInstance(new Object());
+				CertHash.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs b/crypto/test/src/asn1/test/ContentHintsUnitTest.cs
index d7453c27e..7d96fc5c4 100644
--- a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs
+++ b/crypto/test/src/asn1/test/ContentHintsUnitTest.cs
@@ -37,7 +37,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				ContentHints.GetInstance(new Object());
+				ContentHints.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs b/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs
index f9eef4f47..a7cf28798 100644
--- a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs
+++ b/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs
@@ -35,7 +35,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				DeclarationOfMajority.GetInstance(new Object());
+				DeclarationOfMajority.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs b/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs
index cdeb2eca5..01f3b564d 100644
--- a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs
+++ b/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs
@@ -34,7 +34,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				MonetaryLimit.GetInstance(new Object());
+				MonetaryLimit.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs b/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs
index 45f66613b..c8233fb08 100644
--- a/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs
+++ b/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs
@@ -39,7 +39,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				NameOrPseudonym.GetInstance(new Object());
+				NameOrPseudonym.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs b/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs
index 787b2c32d..8eb1d2118 100644
--- a/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs
+++ b/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs
@@ -47,7 +47,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				NamingAuthority.GetInstance(new Object());
+				NamingAuthority.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/OIDTest.cs b/crypto/test/src/asn1/test/OIDTest.cs
index 9a1927a41..1a46d5993 100644
--- a/crypto/test/src/asn1/test/OIDTest.cs
+++ b/crypto/test/src/asn1/test/OIDTest.cs
@@ -77,7 +77,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 			}
 		}
 
-		private void OnCheck(String stem, String test, bool expected)
+		private void OnCheck(string stem, string test, bool expected)
 		{
 			if (expected != new DerObjectIdentifier(test).On(new DerObjectIdentifier(stem)))
 			{
diff --git a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs b/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs
index a09c18e8a..a7b720679 100644
--- a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs
+++ b/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs
@@ -40,7 +40,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				OtherCertID.GetInstance(new Object());
+				OtherCertID.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs b/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs
index 4410d8e4c..692dd9cc1 100644
--- a/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs
+++ b/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs
@@ -37,7 +37,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				OtherCertID.GetInstance(new Object());
+				OtherCertID.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/ParsingTest.cs b/crypto/test/src/asn1/test/ParsingTest.cs
index bb219e2fc..a243ac194 100644
--- a/crypto/test/src/asn1/test/ParsingTest.cs
+++ b/crypto/test/src/asn1/test/ParsingTest.cs
@@ -49,7 +49,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 				try
 				{
-					Object obj;
+					object obj;
 					while ((obj = aIn.ReadObject()) != null)
 					{
 					}
@@ -76,7 +76,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 				try
 				{
-					Object obj;
+					object obj;
 					while ((obj = aIn.ReadObject()) != null)
 					{
 					}
diff --git a/crypto/test/src/asn1/test/PersonalDataUnitTest.cs b/crypto/test/src/asn1/test/PersonalDataUnitTest.cs
index f92e619cf..faeab6253 100644
--- a/crypto/test/src/asn1/test/PersonalDataUnitTest.cs
+++ b/crypto/test/src/asn1/test/PersonalDataUnitTest.cs
@@ -59,7 +59,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				PersonalData.GetInstance(new Object());
+				PersonalData.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs b/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs
index 97d0e3eee..d89d7d83d 100644
--- a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs
+++ b/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs
@@ -49,7 +49,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				ProcurationSyntax.GetInstance(new Object());
+				ProcurationSyntax.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs b/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs
index 6af2658ef..9504c46b8 100644
--- a/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs
+++ b/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs
@@ -53,7 +53,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				ProcurationSyntax.GetInstance(new Object());
+				ProfessionInfo.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/asn1/test/RestrictionUnitTest.cs b/crypto/test/src/asn1/test/RestrictionUnitTest.cs
index 5dd6438cb..073b2ebf9 100644
--- a/crypto/test/src/asn1/test/RestrictionUnitTest.cs
+++ b/crypto/test/src/asn1/test/RestrictionUnitTest.cs
@@ -25,7 +25,7 @@ namespace Org.BouncyCastle.Asn1.Tests
 
 			try
 			{
-				Restriction.GetInstance(new Object());
+				Restriction.GetInstance(new object());
 
 				Fail("GetInstance() failed to detect bad object.");
 			}
diff --git a/crypto/test/src/cmp/test/ProtectedMessageTest.cs b/crypto/test/src/cmp/test/ProtectedMessageTest.cs
index d28984af6..1b7d84eea 100644
--- a/crypto/test/src/cmp/test/ProtectedMessageTest.cs
+++ b/crypto/test/src/cmp/test/ProtectedMessageTest.cs
@@ -366,7 +366,7 @@ namespace Org.BouncyCastle.Cmp.Tests
             set { this.subject = value; }
         }
 
-        public TestCertBuilder AddAttribute(DerObjectIdentifier name, Object value)
+        public TestCertBuilder AddAttribute(DerObjectIdentifier name, object value)
         {
             attrs[name] = value;
             ord.Add(name);
diff --git a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs b/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs
index 4dc09f4e8..3a023fe3a 100644
--- a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs
+++ b/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs
@@ -497,7 +497,7 @@ namespace Org.BouncyCastle.Crypto.Prng.Test
                 cipher.Init(forEncryption, parameters);
             }
 
-            public String AlgorithmName
+            public string AlgorithmName
             {
                 get { return cipher.AlgorithmName; }
             }
diff --git a/crypto/test/src/crypto/prng/test/DrbgTestVector.cs b/crypto/test/src/crypto/prng/test/DrbgTestVector.cs
index e0a8eeaf5..b3f17e458 100644
--- a/crypto/test/src/crypto/prng/test/DrbgTestVector.cs
+++ b/crypto/test/src/crypto/prng/test/DrbgTestVector.cs
@@ -15,7 +15,7 @@ namespace Org.BouncyCastle.Crypto.Prng.Test
         private string _nonce;
         private string _personalisation;
         private int _ss;
-        private String[] _ev;
+        private string[] _ev;
         private IList _ai = new ArrayList();
 
         public DrbgTestVector(IDigest digest, IEntropySource eSource, bool predictionResistance, string nonce,
diff --git a/crypto/test/src/crypto/test/AriaTest.cs b/crypto/test/src/crypto/test/AriaTest.cs
index da92792f9..56244ed71 100644
--- a/crypto/test/src/crypto/test/AriaTest.cs
+++ b/crypto/test/src/crypto/test/AriaTest.cs
@@ -88,7 +88,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        private void CheckTestVector_RFC5794(String[] tv)
+        private void CheckTestVector_RFC5794(string[] tv)
         {
             string name = "'" + tv[0] + "'";
 
diff --git a/crypto/test/src/crypto/test/BCryptTest.cs b/crypto/test/src/crypto/test/BCryptTest.cs
index 42d925f80..05c1cbff5 100644
--- a/crypto/test/src/crypto/test/BCryptTest.cs
+++ b/crypto/test/src/crypto/test/BCryptTest.cs
@@ -109,7 +109,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        private void CheckIllegal(String msg, byte[] pass, byte[] salt, int cost)
+        private void CheckIllegal(string msg, byte[] pass, byte[] salt, int cost)
         {
             try
             {
diff --git a/crypto/test/src/crypto/test/GOST3411_2012_256DigestTest.cs b/crypto/test/src/crypto/test/GOST3411_2012_256DigestTest.cs
index 1f2ef1823..4b48eab4f 100644
--- a/crypto/test/src/crypto/test/GOST3411_2012_256DigestTest.cs
+++ b/crypto/test/src/crypto/test/GOST3411_2012_256DigestTest.cs
@@ -17,7 +17,7 @@ namespace Org.BouncyCastle.Crypto.Tests
     public class GOST3411_2012_256DigestTest
         : DigestTest
     {
-        private static readonly String[] messages;
+        private static readonly string[] messages;
 
         private static char[] M1 =
             {
@@ -55,7 +55,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             messages = new string[] { new string(M1), new string(M2) };
         }
 
-        private static readonly String[] digests = {
+        private static readonly string[] digests = {
             "9d151eefd8590b89daa6ba6cb74af9275dd051026bb149a452fd84e5e57b5500",
             "9dd2fe4e90409e5da87f53976d7405b0c0cac628fc669a741d50063c557e8f50"
         };
diff --git a/crypto/test/src/crypto/test/GOST3411_2012_512DigestTest.cs b/crypto/test/src/crypto/test/GOST3411_2012_512DigestTest.cs
index f4398952b..7b4c0273a 100644
--- a/crypto/test/src/crypto/test/GOST3411_2012_512DigestTest.cs
+++ b/crypto/test/src/crypto/test/GOST3411_2012_512DigestTest.cs
@@ -15,7 +15,7 @@ namespace Org.BouncyCastle.Crypto.Tests
     public class GOST3411_2012_512DigestTest
         : DigestTest
     {
-        private static readonly String[] messages;
+        private static readonly string[] messages;
 
         private static char[] M1 =
             {
@@ -52,7 +52,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             messages = new string[]{ new string(M1), new string(M2) };
         }
 
-        private static readonly String[] digests = {
+        private static readonly string[] digests = {
             "1b54d01a4af5b9d5cc3d86d68d285462b19abc2475222f35c085122be4ba1ffa00ad30f8767b3a82384c6574f024c311e2a481332b08ef7f41797891c1646f48",
             "1e88e62226bfca6f9994f1f2d51569e0daf8475a3b0fe61a5300eee46d961376035fe83549ada2b8620fcd7c496ce5b33f0cb9dddc2b6460143b03dabac9fb28",
         };
diff --git a/crypto/test/src/crypto/test/HCFamilyVecTest.cs b/crypto/test/src/crypto/test/HCFamilyVecTest.cs
index 00b0ee75c..cbac30c4b 100644
--- a/crypto/test/src/crypto/test/HCFamilyVecTest.cs
+++ b/crypto/test/src/crypto/test/HCFamilyVecTest.cs
@@ -123,8 +123,8 @@ namespace Org.BouncyCastle.Crypto.Tests
 				int posA = lead.IndexOf('[');
 				int posB = lead.IndexOf("..");
 				int posC = lead.IndexOf(']');
-				int start = Int32.Parse(lead.Substring(posA + 1, posB - (posA + 1)));
-				int end = Int32.Parse(lead.Substring(posB + 2, posC - (posB + 2)));
+				int start = int.Parse(lead.Substring(posA + 1, posB - (posA + 1)));
+				int end = int.Parse(lead.Substring(posB + 2, posC - (posB + 2)));
 
 				if (start % 64 != 0 || (end - start != 63))
 					throw new InvalidOperationException(vectorName + ": " + lead + " not on 64 byte boundaries");
diff --git a/crypto/test/src/crypto/test/KeccakDigestTest.cs b/crypto/test/src/crypto/test/KeccakDigestTest.cs
index 961a5d2e3..9020d0261 100644
--- a/crypto/test/src/crypto/test/KeccakDigestTest.cs
+++ b/crypto/test/src/crypto/test/KeccakDigestTest.cs
@@ -295,7 +295,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        private void TestMac(IDigest digest, byte[][] keys, String[] data, String[] expected, byte[] truncExpected)
+        private void TestMac(IDigest digest, byte[][] keys, string[] data, string[] expected, byte[] truncExpected)
         {
             IMac mac = new HMac(digest);
 
diff --git a/crypto/test/src/crypto/test/RipeMD128DigestTest.cs b/crypto/test/src/crypto/test/RipeMD128DigestTest.cs
index ead4f06ad..d3b25af66 100644
--- a/crypto/test/src/crypto/test/RipeMD128DigestTest.cs
+++ b/crypto/test/src/crypto/test/RipeMD128DigestTest.cs
@@ -38,7 +38,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 			"3f45ef194732c2dbb2c4a2c769795fa3"
 		};
 
-		readonly static String million_a_digest = "4a7f5723f954eba1216c9d8f6320431f";
+		readonly static string million_a_digest = "4a7f5723f954eba1216c9d8f6320431f";
 
 		public RipeMD128DigestTest()
 			: base(new RipeMD128Digest(), messages, digests)
diff --git a/crypto/test/src/crypto/test/SCryptTest.cs b/crypto/test/src/crypto/test/SCryptTest.cs
index f236c4bf0..24ec1dffd 100644
--- a/crypto/test/src/crypto/test/SCryptTest.cs
+++ b/crypto/test/src/crypto/test/SCryptTest.cs
@@ -45,7 +45,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             CheckIllegal("Len parameter must be > 1", new byte[0], new byte[0], 2, 1, 1, 0);
         }
 
-        private void CheckOK(String msg, byte[] pass, byte[] salt, int N, int r, int p, int len)
+        private void CheckOK(string msg, byte[] pass, byte[] salt, int N, int r, int p, int len)
         {
             try
             {
@@ -58,7 +58,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        private void CheckIllegal(String msg, byte[] pass, byte[] salt, int N, int r, int p, int len)
+        private void CheckIllegal(string msg, byte[] pass, byte[] salt, int N, int r, int p, int len)
         {
             try
             {
diff --git a/crypto/test/src/crypto/test/SHA3DigestTest.cs b/crypto/test/src/crypto/test/SHA3DigestTest.cs
index 71f51f43b..c905ded72 100644
--- a/crypto/test/src/crypto/test/SHA3DigestTest.cs
+++ b/crypto/test/src/crypto/test/SHA3DigestTest.cs
@@ -46,7 +46,7 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
             using (StreamReader r = new StreamReader(SimpleTest.GetTestDataAsStream("crypto.SHA3TestVectors.txt")))
             {
-                String line;
+                string line;
                 while (null != (line = ReadLine(r)))
                 {
                     if (line.Length != 0)
@@ -97,7 +97,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 
         private int ParseDecimal(string s)
         {
-            return Int32.Parse(s);
+            return int.Parse(s);
         }
 
         private string ReadBlock(StreamReader r)
diff --git a/crypto/test/src/crypto/test/SP80038GTest.cs b/crypto/test/src/crypto/test/SP80038GTest.cs
index d8fe83150..119813681 100644
--- a/crypto/test/src/crypto/test/SP80038GTest.cs
+++ b/crypto/test/src/crypto/test/SP80038GTest.cs
@@ -26,12 +26,13 @@ namespace Org.BouncyCastle.Crypto.Tests
             private readonly byte[] ciphertext;
             private readonly byte[] tweak;
 
-            public static FFSample from(int radix, String hexKey, String asciiPT, String asciiCT, String hexTweak)
+            public static FFSample From(int radix, string hexKey, string asciiPT, string asciiCT, string hexTweak)
             {
-                return new FFSample(radix, fromHex(hexKey), fromAscii(radix, asciiPT), fromAscii(radix, asciiCT), fromHex(hexTweak));
+                return new FFSample(radix, FromHex(hexKey), FromAscii(radix, asciiPT), FromAscii(radix, asciiCT),
+                    FromHex(hexTweak));
             }
 
-            private static byte fromAlphaNumeric(char c)
+            private static byte FromAlphaNumeric(char c)
             {
                 if (c >= '0' && c <= '9')
                 {
@@ -51,12 +52,12 @@ namespace Org.BouncyCastle.Crypto.Tests
                 }
             }
 
-            private static byte[] fromAscii(int radix, string ascii)
+            private static byte[] FromAscii(int radix, string ascii)
             {
                 byte[] result = new byte[ascii.Length];
                 for (int i = 0; i < result.Length; ++i)
                 {
-                    result[i] = fromAlphaNumeric(ascii[i]);
+                    result[i] = FromAlphaNumeric(ascii[i]);
                     if (result[i] < 0 || result[i] >= radix)
                     {
                         throw new ArgumentException();
@@ -65,7 +66,7 @@ namespace Org.BouncyCastle.Crypto.Tests
                 return result;
             }
 
-            private static byte[] fromHex(string hex)
+            private static byte[] FromHex(string hex)
             {
                 return Hex.Decode(hex);
             }
@@ -108,25 +109,25 @@ namespace Org.BouncyCastle.Crypto.Tests
         private static FFSample[] ff1Samples = new FFSample[]
         {
             // FF1-AES128
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "2433477484", ""),
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "6124200773", "39383736353433323130"),
-            FFSample.from(36, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789abcdefghi", "a9tv40mll9kdu509eum", "3737373770717273373737"),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "2433477484", ""),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "6124200773", "39383736353433323130"),
+            FFSample.From(36, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789abcdefghi", "a9tv40mll9kdu509eum", "3737373770717273373737"),
 
             // FF1-AES192
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2830668132", ""),
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2496655549", "39383736353433323130"),
-            FFSample.from(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789abcdefghi", "xbj3kv35jrawxv32ysr", "3737373770717273373737"),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2830668132", ""),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2496655549", "39383736353433323130"),
+            FFSample.From(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789abcdefghi", "xbj3kv35jrawxv32ysr", "3737373770717273373737"),
 
             // FF1-AES256
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "6657667009", ""),
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "1001623463", "39383736353433323130"),
-            FFSample.from(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789abcdefghi", "xs8a0azh2avyalyzuwd", "3737373770717273373737"),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "6657667009", ""),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "1001623463", "39383736353433323130"),
+            FFSample.From(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789abcdefghi", "xs8a0azh2avyalyzuwd", "3737373770717273373737"),
         };
 
         private static FFSample[] ff3_1Samples = new FFSample[]
         {
             // FF3-AES128
-            FFSample.from(62, "7793833CE891B496381BD5B882F77EA1", "YbpT3hDo0J9xwCQ5qUWt93iv", "dDEYxViK56lGbV1WdZTPTe4w", "C58797C2580174"),
+            FFSample.From(62, "7793833CE891B496381BD5B882F77EA1", "YbpT3hDo0J9xwCQ5qUWt93iv", "dDEYxViK56lGbV1WdZTPTe4w", "C58797C2580174"),
         };
 
         private void testFF1()
@@ -423,7 +424,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 
         private void testFF3_1Bounds()
         {
-            String bigAlpha = "+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
+            string bigAlpha = "+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
 
             IAlphabetMapper alphabetMapper = new BasicAlphabetMapper(bigAlpha);
 
@@ -463,7 +464,7 @@ namespace Org.BouncyCastle.Crypto.Tests
             }
         }
 
-        private void ff3_1Test(IAlphabetMapper alphabetMapper, String skey, String stweak, String input, String output)
+        private void ff3_1Test(IAlphabetMapper alphabetMapper, string skey, string stweak, string input, string output)
         {
             FpeEngine fpeEncEngine = new FpeFf3_1Engine();
             FpeEngine fpeDecEngine = new FpeFf3_1Engine();
@@ -478,12 +479,12 @@ namespace Org.BouncyCastle.Crypto.Tests
             byte[] bytes = alphabetMapper.ConvertToIndexes(input.ToCharArray());
 
             byte[] encryptedBytes = process(fpeEncEngine, bytes);
-            IsEquals(output, new String(alphabetMapper.ConvertToChars(encryptedBytes)));
+            IsEquals(output, new string(alphabetMapper.ConvertToChars(encryptedBytes)));
 
             byte[] decryptedBytes = process(fpeDecEngine, encryptedBytes);
             IsTrue(Arrays.AreEqual(bytes, decryptedBytes));
             char[] chars = alphabetMapper.ConvertToChars(decryptedBytes);
-            IsEquals(input, new String(chars));
+            IsEquals(input, new string(chars));
         }
 
         private byte[] process(FpeEngine fpeEngine, byte[] bytes)
diff --git a/crypto/test/src/crypto/test/ShakeDigestTest.cs b/crypto/test/src/crypto/test/ShakeDigestTest.cs
index d8b2d55d6..70d7436ec 100644
--- a/crypto/test/src/crypto/test/ShakeDigestTest.cs
+++ b/crypto/test/src/crypto/test/ShakeDigestTest.cs
@@ -46,7 +46,7 @@ namespace Org.BouncyCastle.Crypto.Tests
         {
             using (StreamReader r = new StreamReader(SimpleTest.GetTestDataAsStream("crypto.SHAKETestVectors.txt")))
             {
-                String line;
+                string line;
                 while (null != (line = ReadLine(r)))
                 {
                     if (line.Length != 0)
@@ -97,7 +97,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 
         private int ParseDecimal(string s)
         {
-            return Int32.Parse(s);
+            return int.Parse(s);
         }
 
         private string ReadBlock(StreamReader r)
diff --git a/crypto/test/src/crypto/test/SkeinMacTest.cs b/crypto/test/src/crypto/test/SkeinMacTest.cs
index 852c3b2c7..fcd654233 100644
--- a/crypto/test/src/crypto/test/SkeinMacTest.cs
+++ b/crypto/test/src/crypto/test/SkeinMacTest.cs
@@ -24,7 +24,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 			private int blockSize;
 			private int outputSize;
 
-			public Case(int blockSize, int outputSize, String message, String key, String digest)
+			public Case(int blockSize, int outputSize, string message, string key, string digest)
 			{
 				this.blockSize = blockSize;
 				this.outputSize = outputSize;
@@ -60,10 +60,9 @@ namespace Org.BouncyCastle.Crypto.Tests
 
 			public override string ToString()
 			{
-				return String.Format("new Case({0}, {1}, \"{2}\", \"{3}\", \"{4}\"),", blockSize, outputSize,
-				                     Hex.ToHexString(message), Hex.ToHexString(key), Hex.ToHexString(digest));
+				return string.Format("new Case({0}, {1}, \"{2}\", \"{3}\", \"{4}\"),", blockSize, outputSize,
+					Hex.ToHexString(message), Hex.ToHexString(key), Hex.ToHexString(digest));
 			}
-
 		}
 
 		// Test cases from skein_golden_kat.txt in Skein 1.3 NIST CD
diff --git a/crypto/test/src/crypto/test/XSalsa20Test.cs b/crypto/test/src/crypto/test/XSalsa20Test.cs
index 74ed04e88..519c5bcb9 100644
--- a/crypto/test/src/crypto/test/XSalsa20Test.cs
+++ b/crypto/test/src/crypto/test/XSalsa20Test.cs
@@ -25,7 +25,7 @@ namespace Org.BouncyCastle.Crypto.Tests
 			private byte[] plaintext;
 			private byte[] ciphertext;
 
-			public TestCase(String key, string iv, string plaintext, string ciphertext)
+			public TestCase(string key, string iv, string plaintext, string ciphertext)
 			{
 				this.key = Hex.Decode(key);
 				this.iv = Hex.Decode(iv);
diff --git a/crypto/test/src/crypto/test/cavp/CavpReader.cs b/crypto/test/src/crypto/test/cavp/CavpReader.cs
index 0b040927e..dc32e0ff8 100644
--- a/crypto/test/src/crypto/test/cavp/CavpReader.cs
+++ b/crypto/test/src/crypto/test/cavp/CavpReader.cs
@@ -64,7 +64,7 @@ namespace Org.BouncyCastle.Crypto.Tests.Cavp
             if (value == null)
                 throw new InvalidOperationException(name + " was null");
 
-            return Int32.Parse(value);
+            return int.Parse(value);
         }
 
         public int ValueAsInt(string name, int def)
@@ -73,7 +73,7 @@ namespace Org.BouncyCastle.Crypto.Tests.Cavp
             if (value == null)
                 return def;
 
-            return Int32.Parse(value);
+            return int.Parse(value);
         }
     }
 
@@ -89,7 +89,7 @@ namespace Org.BouncyCastle.Crypto.Tests.Cavp
 
             using (StreamReader r = new StreamReader(SimpleTest.GetTestDataAsStream("crypto.cavp." + name)))
             {
-                String line;
+                string line;
                 while (null != (line = r.ReadLine()))
                 {
                     // Reading a header or waiting to encounter a header
diff --git a/crypto/test/src/crypto/test/cavp/KDFCounterTests.cs b/crypto/test/src/crypto/test/cavp/KDFCounterTests.cs
index e0f8755e7..4cd20a93b 100644
--- a/crypto/test/src/crypto/test/cavp/KDFCounterTests.cs
+++ b/crypto/test/src/crypto/test/cavp/KDFCounterTests.cs
@@ -43,7 +43,7 @@ namespace Org.BouncyCastle.Crypto.Tests.Cavp
                     {
                         Assert.Fail("No RLEN");
                     }
-                    r = Int32.Parse(rlen.Split('_')[0]);
+                    r = int.Parse(rlen.Split('_')[0]);
                 }
                 int count = vector.ValueAsInt("COUNT");
                 int l = vector.ValueAsInt("L");
diff --git a/crypto/test/src/crypto/test/cavp/KDFDoublePipelineTests.cs b/crypto/test/src/crypto/test/cavp/KDFDoublePipelineTests.cs
index 674224447..7d1558ce9 100644
--- a/crypto/test/src/crypto/test/cavp/KDFDoublePipelineTests.cs
+++ b/crypto/test/src/crypto/test/cavp/KDFDoublePipelineTests.cs
@@ -69,7 +69,7 @@ namespace Org.BouncyCastle.Crypto.Tests.Cavp
                     {
                         Assert.Fail("No RLEN");
                     }
-                    r = Int32.Parse(rlen.Split('_')[0]);
+                    r = int.Parse(rlen.Split('_')[0]);
                 }
                 int count = vector.ValueAsInt("COUNT");
                 int l = vector.ValueAsInt("L");
diff --git a/crypto/test/src/crypto/test/cavp/KDFFeedbackCounterTests.cs b/crypto/test/src/crypto/test/cavp/KDFFeedbackCounterTests.cs
index ea052b8f5..26789bf28 100644
--- a/crypto/test/src/crypto/test/cavp/KDFFeedbackCounterTests.cs
+++ b/crypto/test/src/crypto/test/cavp/KDFFeedbackCounterTests.cs
@@ -70,7 +70,7 @@ namespace Org.BouncyCastle.Crypto.Tests.Cavp
                     {
                        Fail("No RLEN");
                     }
-                    r = Int32.Parse(rlen.Split('_')[0]);
+                    r = int.Parse(rlen.Split('_')[0]);
                 }
                 int count = vector.ValueAsInt("COUNT");
                 int l = vector.ValueAsInt("L");
diff --git a/crypto/test/src/math/ec/test/ECPointTest.cs b/crypto/test/src/math/ec/test/ECPointTest.cs
index 4b17d8c0a..f3fc6e592 100644
--- a/crypto/test/src/math/ec/test/ECPointTest.cs
+++ b/crypto/test/src/math/ec/test/ECPointTest.cs
@@ -88,7 +88,7 @@ namespace Org.BouncyCastle.Math.EC.Tests
 
             internal static readonly ECPoint infinity = curve.Infinity;
 
-            internal static readonly String[] pointSource = { "0010", "1111", "1100", "1100",
+            internal static readonly string[] pointSource = { "0010", "1111", "1100", "1100",
                     "0001", "0001", "1011", "0010" };
 
             internal static readonly ECPoint[] p = new ECPoint[pointSource.Length / 2];
diff --git a/crypto/test/src/math/ec/test/TnafTest.cs b/crypto/test/src/math/ec/test/TnafTest.cs
index 98aff0025..36245b5a6 100644
--- a/crypto/test/src/math/ec/test/TnafTest.cs
+++ b/crypto/test/src/math/ec/test/TnafTest.cs
@@ -91,7 +91,7 @@
 //			ImplTestMultiplyTnaf("sect571k1");
 //		}
 //
-//		private void ImplTestMultiplyWnaf(String curveName) 
+//		private void ImplTestMultiplyWnaf(string curveName) 
 //		{
 //			X9ECParameters x9ECParameters = SecNamedCurves.GetByName(curveName);
 //
diff --git a/crypto/test/src/openpgp/examples/DirectKeySignature.cs b/crypto/test/src/openpgp/examples/DirectKeySignature.cs
index 3926a787b..c36bba996 100644
--- a/crypto/test/src/openpgp/examples/DirectKeySignature.cs
+++ b/crypto/test/src/openpgp/examples/DirectKeySignature.cs
@@ -57,11 +57,11 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Examples
 				// gather command line arguments
 				PgpSecretKeyRing secRing = new PgpSecretKeyRing(
 					PgpUtilities.GetDecoderStream(secFis));
-				String secretKeyPass = args[1];
+				string secretKeyPass = args[1];
 				PgpPublicKeyRing ring = new PgpPublicKeyRing(
 					PgpUtilities.GetDecoderStream(pubFis));
-				String notationName = args[3];
-				String notationValue = args[4];
+				string notationName = args[3];
+				string notationValue = args[4];
 
 				// create the signed keyRing
 				PgpPublicKeyRing sRing = null;
diff --git a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs b/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
index d73e3d7a6..afc0d1cbc 100644
--- a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
+++ b/crypto/test/src/openpgp/test/PgpUnicodeTest.cs
@@ -55,7 +55,7 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp.Tests
  //             byte[] password = new byte[passwordFile.available()];
  //             passwordFile.read(password);
  //             passwordFile.close();
- //             String passphrase = new String(password);            
+ //             string passphrase = new string(password);            
 
                 DoTestKey(keyId, passphrase, true);
 
diff --git a/crypto/test/src/openssl/test/AllTests.cs b/crypto/test/src/openssl/test/AllTests.cs
index 0cc2dcd85..1d528b27b 100644
--- a/crypto/test/src/openssl/test/AllTests.cs
+++ b/crypto/test/src/openssl/test/AllTests.cs
@@ -96,7 +96,7 @@ namespace Org.BouncyCastle.OpenSsl.Tests
 			pWrt.WriteObject(pkcs8);
 			pWrt.Writer.Close();
 
-			String result = sw.ToString();
+			string result = sw.ToString();
 
 			PemReader pRd = new PemReader(new StringReader(result), new Password("hello".ToCharArray()));
 
diff --git a/crypto/test/src/openssl/test/ReaderTest.cs b/crypto/test/src/openssl/test/ReaderTest.cs
index 95bbe6a4d..6dd78ff93 100644
--- a/crypto/test/src/openssl/test/ReaderTest.cs
+++ b/crypto/test/src/openssl/test/ReaderTest.cs
@@ -335,7 +335,7 @@ namespace Org.BouncyCastle.OpenSsl.Tests
                 IPasswordFinder pGet = new Password(password.ToCharArray());
                 PemReader pemRd = OpenPemResource("test.pem", pGet);
 
-                Object o;
+                object o;
                 while ((o = pemRd.ReadObject()) != null)
                 {
                 }
diff --git a/crypto/test/src/pkcs/test/PKCS10Test.cs b/crypto/test/src/pkcs/test/PKCS10Test.cs
index 45d59ed49..c3bc4c948 100644
--- a/crypto/test/src/pkcs/test/PKCS10Test.cs
+++ b/crypto/test/src/pkcs/test/PKCS10Test.cs
@@ -32,15 +32,12 @@ namespace Org.BouncyCastle.Pkcs.Tests
         [Test]
         public void BrokenRequestWithDuplicateExtension()
         {
-
-            String keyName = "RSA";
+            string keyName = "RSA";
             int keySize = 2048;
 
-            String sigName = "SHA256withRSA";
+            string sigName = "SHA256withRSA";
 
             IAsymmetricCipherKeyPairGenerator kpg = GeneratorUtilities.GetKeyPairGenerator(keyName);
-
-            //			kpg.initialize(keySize);
             kpg.Init(new KeyGenerationParameters(new SecureRandom(), keySize));
 
             AsymmetricCipherKeyPair kp = kpg.GenerateKeyPair();
diff --git a/crypto/test/src/test/PkixTest.cs b/crypto/test/src/test/PkixTest.cs
index 882319610..904f8af0c 100644
--- a/crypto/test/src/test/PkixTest.cs
+++ b/crypto/test/src/test/PkixTest.cs
@@ -226,7 +226,7 @@ namespace Org.BouncyCastle.Tests
             }
         }
 
-		public override String Name
+		public override string Name
 		{
 			get { return "PkixTest"; }
         }
diff --git a/crypto/test/src/test/SP80038GTest.cs b/crypto/test/src/test/SP80038GTest.cs
index adf6f35d8..842513218 100644
--- a/crypto/test/src/test/SP80038GTest.cs
+++ b/crypto/test/src/test/SP80038GTest.cs
@@ -24,12 +24,13 @@ namespace Org.BouncyCastle.Tests
         private readonly byte[] ciphertext;
         private readonly byte[] tweak;
 
-        public static FFSample from(int radix, String hexKey, String asciiPT, String asciiCT, String hexTweak)
+        public static FFSample From(int radix, string hexKey, string asciiPT, string asciiCT, string hexTweak)
         {
-            return new FFSample(radix, fromHex(hexKey), fromAscii(radix, asciiPT), fromAscii(radix, asciiCT), fromHex(hexTweak));
+            return new FFSample(radix, FromHex(hexKey), FromAscii(radix, asciiPT), FromAscii(radix, asciiCT),
+                FromHex(hexTweak));
         }
 
-        private static byte fromAlphaNumeric(char c)
+        private static byte FromAlphaNumeric(char c)
         {
             if (c >= '0' && c <= '9')
             {
@@ -49,12 +50,12 @@ namespace Org.BouncyCastle.Tests
             }
         }
 
-        private static byte[] fromAscii(int radix, string ascii)
+        private static byte[] FromAscii(int radix, string ascii)
         {
             byte[] result = new byte[ascii.Length];
             for (int i = 0; i < result.Length; ++i)
             {
-                result[i] = fromAlphaNumeric(ascii[i]);
+                result[i] = FromAlphaNumeric(ascii[i]);
                 if (result[i] < 0 || result[i] >= radix)
                 {
                     throw new ArgumentException();
@@ -63,7 +64,7 @@ namespace Org.BouncyCastle.Tests
             return result;
         }
 
-        private static byte[] fromHex(string hex)
+        private static byte[] FromHex(string hex)
         {
             return Hex.Decode(hex);
         }
@@ -106,25 +107,25 @@ namespace Org.BouncyCastle.Tests
     private static FFSample[] ff1Samples = new FFSample[]
         {
             // FF1-AES128
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "2433477484", ""),
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "6124200773", "39383736353433323130"),
-            FFSample.from(36, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789abcdefghi", "a9tv40mll9kdu509eum", "3737373770717273373737"),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "2433477484", ""),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789", "6124200773", "39383736353433323130"),
+            FFSample.From(36, "2B7E151628AED2A6ABF7158809CF4F3C", "0123456789abcdefghi", "a9tv40mll9kdu509eum", "3737373770717273373737"),
 
             // FF1-AES192
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2830668132", ""),
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2496655549", "39383736353433323130"),
-            FFSample.from(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789abcdefghi", "xbj3kv35jrawxv32ysr", "3737373770717273373737"),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2830668132", ""),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789", "2496655549", "39383736353433323130"),
+            FFSample.From(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F", "0123456789abcdefghi", "xbj3kv35jrawxv32ysr", "3737373770717273373737"),
 
             // FF1-AES256
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "6657667009", ""),
-            FFSample.from(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "1001623463", "39383736353433323130"),
-            FFSample.from(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789abcdefghi", "xs8a0azh2avyalyzuwd", "3737373770717273373737"),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "6657667009", ""),
+            FFSample.From(10, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789", "1001623463", "39383736353433323130"),
+            FFSample.From(36, "2B7E151628AED2A6ABF7158809CF4F3CEF4359D8D580AA4F7F036D6F04FC6A94", "0123456789abcdefghi", "xs8a0azh2avyalyzuwd", "3737373770717273373737"),
         };
 
     private static FFSample[] ff3_1Samples = new FFSample[]
         {
             // FF3-AES128
-            FFSample.from(62, "7793833CE891B496381BD5B882F77EA1", "YbpT3hDo0J9xwCQ5qUWt93iv", "dDEYxViK56lGbV1WdZTPTe4w", "C58797C2580174"),
+            FFSample.From(62, "7793833CE891B496381BD5B882F77EA1", "YbpT3hDo0J9xwCQ5qUWt93iv", "dDEYxViK56lGbV1WdZTPTe4w", "C58797C2580174"),
         };
 
     private void testFF1()
@@ -421,7 +422,7 @@ namespace Org.BouncyCastle.Tests
 
     private void testFF3_1Bounds()
     {
-        String bigAlpha = "+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
+        string bigAlpha = "+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyz";
 
         IAlphabetMapper alphabetMapper = new BasicAlphabetMapper(bigAlpha);
 
@@ -461,7 +462,7 @@ namespace Org.BouncyCastle.Tests
         }
     }
 
-    private void ff3_1Test(IAlphabetMapper alphabetMapper, String skey, String stweak, String input, String output)
+    private void ff3_1Test(IAlphabetMapper alphabetMapper, string skey, string stweak, string input, string output)
     {
         FpeEngine fpeEncEngine = new FpeFf3_1Engine();
         FpeEngine fpeDecEngine = new FpeFf3_1Engine();
@@ -476,12 +477,12 @@ namespace Org.BouncyCastle.Tests
         byte[] bytes = alphabetMapper.ConvertToIndexes(input.ToCharArray());
 
         byte[] encryptedBytes = process(fpeEncEngine, bytes);
-        IsEquals(output, new String(alphabetMapper.ConvertToChars(encryptedBytes)));
+        IsEquals(output, new string(alphabetMapper.ConvertToChars(encryptedBytes)));
 
         byte[] decryptedBytes = process(fpeDecEngine, encryptedBytes);
         IsTrue(Arrays.AreEqual(bytes, decryptedBytes));
         char[] chars = alphabetMapper.ConvertToChars(decryptedBytes);
-        IsEquals(input, new String(chars));
+        IsEquals(input, new string(chars));
     }
 
     private byte[] process(FpeEngine fpeEngine, byte[] bytes)
diff --git a/crypto/test/src/tls/test/MockDtlsClient.cs b/crypto/test/src/tls/test/MockDtlsClient.cs
index e758639ec..e56f035d1 100644
--- a/crypto/test/src/tls/test/MockDtlsClient.cs
+++ b/crypto/test/src/tls/test/MockDtlsClient.cs
@@ -158,7 +158,7 @@ namespace Org.BouncyCastle.Tls.Tests
                 if (isEmpty)
                     throw new TlsFatalAlert(AlertDescription.bad_certificate);
 
-                string[] trustedCertResources = new String[]{ "x509-server-dsa.pem", "x509-server-ecdh.pem",
+                string[] trustedCertResources = new string[]{ "x509-server-dsa.pem", "x509-server-ecdh.pem",
                     "x509-server-ecdsa.pem", "x509-server-ed25519.pem", "x509-server-ed448.pem",
                     "x509-server-rsa_pss_256.pem", "x509-server-rsa_pss_384.pem", "x509-server-rsa_pss_512.pem",
                     "x509-server-rsa-enc.pem", "x509-server-rsa-sign.pem" };