[corlib] rename NotWorkingInterpreter and InterpreterNotWorking categories (#6225)

24 files changed, 62 insertions, 62 deletions

diff --git a/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs b/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
index a038b6c7fda..ea5e716e270 100755
--- a/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
+++ b/mcs/class/corlib/Test/Microsoft.Win32/RegistryKeyTest.cs
@@ -3189,7 +3189,7 @@ namespace MonoTests.Microsoft.Win32
 
 		// Bug Xamarin 3632
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TypeCastTests ()
 		{
 			string subKeyName = Guid.NewGuid ().ToString ();
diff --git a/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs b/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
index e46dd7e31f5..11851a216ea 100644
--- a/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
+++ b/mcs/class/corlib/Test/System.Collections.Concurrent/PartitionerTests.cs
@@ -37,7 +37,7 @@ namespace MonoTests.System.Collections.Concurrent
 	public class PartitionerTests
 	{
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void PartitionerCreateIntegerWithExplicitRange ()
 		{
 			OrderablePartitioner<Tuple<int, int>> partitioner = Partitioner.Create (1, 20, 5);
@@ -59,7 +59,7 @@ namespace MonoTests.System.Collections.Concurrent
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void PartitionerCreateLongWithExplicitRange ()
 		{
 			OrderablePartitioner<Tuple<long, long>> partitioner = Partitioner.Create ((long)1, (long)20, (long)5);
diff --git a/mcs/class/corlib/Test/System.IO/DriveInfoTest.cs b/mcs/class/corlib/Test/System.IO/DriveInfoTest.cs
index e23b087a08c..777aaad2bb1 100644
--- a/mcs/class/corlib/Test/System.IO/DriveInfoTest.cs
+++ b/mcs/class/corlib/Test/System.IO/DriveInfoTest.cs
@@ -65,7 +65,7 @@ namespace MonoTests.System.IO
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void GetDrivesValidInfo ()
 		{
 			var drives = DriveInfo.GetDrives ();
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/DynamicMethodTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/DynamicMethodTest.cs
index 4ac4f6d78f1..da29af0f406 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/DynamicMethodTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/DynamicMethodTest.cs
@@ -470,7 +470,7 @@ namespace MonoTests.System.Reflection.Emit
 
 	public delegate object RetObj();
 		[Test] //#640702
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void GetCurrentMethodWorksWithDynamicMethods ()
 		{
 	        DynamicMethod dm = new DynamicMethod("Foo", typeof(object), null);
@@ -527,7 +527,7 @@ namespace MonoTests.System.Reflection.Emit
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ExceptionHandling ()
 		{
 			var method = new DynamicMethod ("", typeof(void), new[] { typeof(int) }, typeof (DynamicMethodTest));
@@ -594,7 +594,7 @@ namespace MonoTests.System.Reflection.Emit
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ExceptionHandlingWithExceptionDispatchInfo ()
 		{
 			var method = new DynamicMethod ("", typeof(void), new[] { typeof(int) }, typeof (DynamicMethodTest));
@@ -652,7 +652,7 @@ namespace MonoTests.System.Reflection.Emit
 		}
 
 		[Test] //see bxc #59334
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ExceptionWrapping ()
 		{
 			AssemblyBuilder ab = AppDomain.CurrentDomain.DefineDynamicAssembly (new AssemblyName ("ehatevfheiw"), AssemblyBuilderAccess.Run);
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
index 5d0a4978351..51739a306ec 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/MethodBuilderTest.cs
@@ -1024,7 +1024,7 @@ namespace MonoTests.System.Reflection.Emit
 	    }
 
 		[Test]//bug #626441
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void CanCallVarargMethods ()
 		{
 			var tb = module.DefineType ("foo");
diff --git a/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs b/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs
index ebc7cb573f5..ecf68042d94 100644
--- a/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs
+++ b/mcs/class/corlib/Test/System.Reflection.Emit/TypeBuilderTest.cs
@@ -1212,7 +1212,7 @@ namespace MonoTests.System.Reflection.Emit
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void DefineDefaultConstructor_Parent_DefaultCtorInaccessible ()
 		{
 			TypeBuilder tb;
diff --git a/mcs/class/corlib/Test/System.Runtime.ExceptionServices/ExceptionDispatchInfoTest.cs b/mcs/class/corlib/Test/System.Runtime.ExceptionServices/ExceptionDispatchInfoTest.cs
index 1e1c308bdbb..c17199476c5 100644
--- a/mcs/class/corlib/Test/System.Runtime.ExceptionServices/ExceptionDispatchInfoTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.ExceptionServices/ExceptionDispatchInfoTest.cs
@@ -66,7 +66,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void Throw ()
 		{
 			Exception orig = null;
@@ -93,7 +93,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ThrowWithEmptyFrames ()
 		{
 			var edi = ExceptionDispatchInfo.Capture (new OperationCanceledException ());
@@ -108,7 +108,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void LastThrowWins ()
 		{
 			Exception e;
@@ -140,7 +140,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ThrowMultipleCaptures ()
 		{
 			Exception e;
@@ -169,7 +169,7 @@ namespace MonoTests.System.Runtime.ExceptionServices
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void StackTraceUserCopy ()
 		{
 			try {
diff --git a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
index a59293153be..055f6bdaa5a 100644
--- a/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.InteropServices/MarshalTest.cs
@@ -963,7 +963,7 @@ namespace MonoTests.System.Runtime.InteropServices
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void CheckPtrToStructureWithFixedArrayAndBaseClassFields()
 		{
 			const int arraySize = 6;
diff --git a/mcs/class/corlib/Test/System.Runtime.Remoting.Proxies/RealProxyTest.cs b/mcs/class/corlib/Test/System.Runtime.Remoting.Proxies/RealProxyTest.cs
index 6ac508c9730..6f2a158a0ac 100644
--- a/mcs/class/corlib/Test/System.Runtime.Remoting.Proxies/RealProxyTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Remoting.Proxies/RealProxyTest.cs
@@ -28,7 +28,7 @@ namespace MonoTests.System.Runtime.Remoting.Proxies {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void InterfaceProxyGetTypeOkay ()
 		{
 			// Regression test for #17325
diff --git a/mcs/class/corlib/Test/System.Runtime.Remoting/ContextTest.cs b/mcs/class/corlib/Test/System.Runtime.Remoting/ContextTest.cs
index 2fcf05d0367..1ed6d8fee79 100644
--- a/mcs/class/corlib/Test/System.Runtime.Remoting/ContextTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Remoting/ContextTest.cs
@@ -40,7 +40,7 @@ namespace MonoTests.System.Runtime.Remoting
 		LocalDataStoreSlot slot;
 		
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestDoCallback ()
 		{
 			otherCtx = cbo.GetContext ();
@@ -55,7 +55,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 		
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestDatastore ()
 		{
 			otherCtx = cbo.GetContext ();
diff --git a/mcs/class/corlib/Test/System.Runtime.Remoting/SynchronizationAttributeTest.cs b/mcs/class/corlib/Test/System.Runtime.Remoting/SynchronizationAttributeTest.cs
index 0c4bee45e88..2f2c0288161 100644
--- a/mcs/class/corlib/Test/System.Runtime.Remoting/SynchronizationAttributeTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Remoting/SynchronizationAttributeTest.cs
@@ -146,7 +146,7 @@ namespace MonoTests.System.Runtime.Remoting
 		bool otResult;
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestSynchronization ()
 		{
 			Thread tr = new Thread (new ThreadStart (FirstSyncThread));
@@ -170,7 +170,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestSupported ()
 		{
 			SincroRequiresNew ob = new SincroRequiresNew ();
@@ -183,7 +183,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestRequired ()
 		{
 			SincroRequiresNew ob = new SincroRequiresNew ();
@@ -196,7 +196,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestRequiresNew ()
 		{
 			SincroRequiresNew ob = new SincroRequiresNew ();
@@ -209,7 +209,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestNotSupported ()
 		{
 			SincroRequiresNew ob = new SincroRequiresNew ();
@@ -222,7 +222,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestLocked1 ()
 		{
 			sincob.Lock (false);
@@ -237,7 +237,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestLocked2 ()
 		{
 			Thread tr = new Thread (new ThreadStart (FirstNotSyncThread));
@@ -261,7 +261,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestLocked3 ()
 		{
 			Thread tr = new Thread (new ThreadStart (Lock1Thread));
@@ -281,7 +281,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestReentry ()
 		{
 			Thread tr = new Thread (new ThreadStart (FirstReentryThread));
@@ -305,7 +305,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestNoReentry ()
 		{
 			Thread tr = new Thread (new ThreadStart (FirstNoReentryThread));
@@ -329,7 +329,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestCallback ()
 		{
 			Thread tr = new Thread (new ThreadStart (CallbackThread));
@@ -344,7 +344,7 @@ namespace MonoTests.System.Runtime.Remoting
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestSynchronizationReleasedOnMultipleAcquire ()
 		{
 
@@ -367,7 +367,7 @@ namespace MonoTests.System.Runtime.Remoting
 		[Test]
 		[Category("NotDotNet")]
 		[Category ("MobileNotWorking")]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestMonitorWait ()
 		{
 			Thread tr = new Thread (new ThreadStart (DoMonitorPulse));
diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationTest.cs b/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationTest.cs
index 8bfd75d1569..aa677741266 100644
--- a/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationTest.cs
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/SerializationTest.cs
@@ -30,7 +30,7 @@ namespace MonoTests.System.Runtime.Serialization
 
 #if FEATURE_REMOTING
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestSerialization ()
 		{
 			MethodTester mt = new MethodTester();
diff --git a/mcs/class/corlib/Test/System.Threading/InterlockedTest.cs b/mcs/class/corlib/Test/System.Threading/InterlockedTest.cs
index e98980d8574..45cb6215705 100644
--- a/mcs/class/corlib/Test/System.Threading/InterlockedTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/InterlockedTest.cs
@@ -99,7 +99,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")] /* crashes on linux/armv7 */
+		[Category ("NotWorkingRuntimeInterpreter")] /* crashes on linux/armv7 */
 		public void TestCompareExchange_Flt ()
 		{
 			flt = flt_1;
diff --git a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
index 854cea5d7d8..99a45106e4f 100644
--- a/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
+++ b/mcs/class/corlib/Test/System.Threading/ThreadTest.cs
@@ -307,7 +307,7 @@ namespace MonoTests.System.Threading
 
 		[Test]
 		[Category ("NotDotNet")] // it hangs.
-		[Category ("InterpreterNotWorking")] /* crashes on linux/arm64 */
+		[Category ("NotWorkingRuntimeInterpreter")] /* crashes on linux/arm64 */
 		public void TestStart()
 		{
 		{
@@ -450,7 +450,7 @@ namespace MonoTests.System.Threading
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestUndivisibleByPageSizeMaxStackSize ()
 		{
 			const int undivisible_stacksize = 1048573;
diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs
index 8f9fe1c0099..7dddddb510a 100644
--- a/mcs/class/corlib/Test/System/ConvertTest.cs
+++ b/mcs/class/corlib/Test/System/ConvertTest.cs
@@ -1295,7 +1295,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToInt32() {
 			long tryMax = long.MaxValue;
 			long tryMin = long.MinValue;
@@ -1474,7 +1474,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToInt64() {
 			decimal longMax = long.MaxValue;
 			longMax += 1000000;
@@ -1869,7 +1869,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToSingle() {
 			int iTest = 1;
 			try {
@@ -4919,7 +4919,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ChangeTypeFromInvalidDouble ()
 		{
 			// types which should generate OverflowException from double.NaN, etc.
diff --git a/mcs/class/corlib/Test/System/DecimalTest-Microsoft.cs b/mcs/class/corlib/Test/System/DecimalTest-Microsoft.cs
index a29ba7ae7bd..a96478e53af 100644
--- a/mcs/class/corlib/Test/System/DecimalTest-Microsoft.cs
+++ b/mcs/class/corlib/Test/System/DecimalTest-Microsoft.cs
@@ -708,7 +708,7 @@ namespace MonoTests.System
 		}
 		
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToSingle()
 		{
 		    // Single Decimal.ToSingle(Decimal)
@@ -726,7 +726,7 @@ namespace MonoTests.System
 		}
 		
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestToDouble()
 		{
 		    Double d = Decimal.ToDouble(new Decimal(0, 0, 1, false, 0));
diff --git a/mcs/class/corlib/Test/System/DecimalTest.cs b/mcs/class/corlib/Test/System/DecimalTest.cs
index ac164e8c939..00f1cf9ec3b 100644
--- a/mcs/class/corlib/Test/System/DecimalTest.cs
+++ b/mcs/class/corlib/Test/System/DecimalTest.cs
@@ -507,7 +507,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestConstructSingle ()
 		{
 			Decimal d;
@@ -630,7 +630,7 @@ namespace MonoTests.System
 
 		[Test]
 		[SetCulture("en-US")]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestConstructDouble ()
 		{
 			Decimal d;
@@ -729,7 +729,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestConstructDoubleRound ()
 		{
 			decimal d;
@@ -982,7 +982,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ToInt32 ()
 		{
 			Decimal d = 254.9m;
@@ -1045,7 +1045,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ToSingle ()
 		{
 			Decimal d = 254.9m;
@@ -1059,7 +1059,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ToDouble ()
 		{
 			Decimal d = 254.9m;
diff --git a/mcs/class/corlib/Test/System/DelegateTest.cs b/mcs/class/corlib/Test/System/DelegateTest.cs
index d84fa2c8985..26c449615b3 100644
--- a/mcs/class/corlib/Test/System/DelegateTest.cs
+++ b/mcs/class/corlib/Test/System/DelegateTest.cs
@@ -851,7 +851,7 @@ namespace MonoTests.System
 		delegate object Boxer ();
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void BoxingCovariance ()
 		{
 			var boxer = (Boxer) Delegate.CreateDelegate (
@@ -913,7 +913,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void NullFirstArgumentOnStaticMethod ()
 		{
 			CallTarget call = (CallTarget) Delegate.CreateDelegate (
@@ -927,7 +927,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 #if MONOTOUCH || FULL_AOT_RUNTIME
 		[Category ("NotWorking")] // #10539
 #endif
@@ -1027,7 +1027,7 @@ namespace MonoTests.System
 #if MONOTOUCH || FULL_AOT_RUNTIME
 		[Category ("NotWorking")] // #10539
 #endif
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ClosedOverNullReferenceStaticMethod ()
 		{
 			var del = (Func<long?,long?>) Delegate.CreateDelegate (
@@ -1105,7 +1105,7 @@ namespace MonoTests.System
 		event Action bar_handler;
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		[ExpectedException (typeof (ArgumentException))] // #635349, #605936
 		public void NewDelegateClosedOverNullReferenceInstanceMethod ()
 		{
@@ -1149,7 +1149,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void DynamicInvokeOpenInstanceDelegate ()
 		{
 			var d1 = Delegate.CreateDelegate (typeof (Func<DelegateTest, int>), typeof(DelegateTest).GetMethod ("DynamicInvokeOpenInstanceDelegate_CB"));
@@ -1287,7 +1287,7 @@ namespace MonoTests.System
 		}
 #if !MONOTOUCH && !FULL_AOT_RUNTIME
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void CreateDelegateWithLdFtnAndAbstractMethod ()
 		{
 			AssemblyName assemblyName = new AssemblyName ();
diff --git a/mcs/class/corlib/Test/System/ExceptionTest.cs b/mcs/class/corlib/Test/System/ExceptionTest.cs
index 9793ab3ba46..d383e62452f 100644
--- a/mcs/class/corlib/Test/System/ExceptionTest.cs
+++ b/mcs/class/corlib/Test/System/ExceptionTest.cs
@@ -262,7 +262,7 @@ namespace MonoTests.System
 		}

 

 		[Test]

-		[Category ("InterpreterNotWorking")]

+		[Category ("NotWorkingRuntimeInterpreter")]

 		public void GetObjectData ()

 		{

 			string msg = "MESSAGE";

@@ -380,7 +380,7 @@ namespace MonoTests.System
 		}

 

 		[Test]

-		[Category ("InterpreterNotWorking")]

+		[Category ("NotWorkingRuntimeInterpreter")]

 		public void Source ()

 		{

 			Exception ex1 = new Exception ("MSG");

diff --git a/mcs/class/corlib/Test/System/GCTest.cs b/mcs/class/corlib/Test/System/GCTest.cs
index 52c8c8cb0c4..b1027340f96 100644
--- a/mcs/class/corlib/Test/System/GCTest.cs
+++ b/mcs/class/corlib/Test/System/GCTest.cs
@@ -56,7 +56,7 @@ namespace MonoTests.System {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void ReRegisterForFinalizeTest ()
 		{
 			var thread =  new Thread (Run_ReRegisterForFinalizeTest);
diff --git a/mcs/class/corlib/Test/System/TimeZoneTest.cs b/mcs/class/corlib/Test/System/TimeZoneTest.cs
index d5861e175be..5f73383f882 100644
--- a/mcs/class/corlib/Test/System/TimeZoneTest.cs
+++ b/mcs/class/corlib/Test/System/TimeZoneTest.cs
@@ -313,7 +313,7 @@ public class TimeZoneTest {
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void GetUtcOffsetAtDSTBoundary ()
 		{
 			/*
diff --git a/mcs/class/corlib/Test/System/TypedReferenceCas.cs b/mcs/class/corlib/Test/System/TypedReferenceCas.cs
index 2b0ee5e2835..29f4226dcb3 100644
--- a/mcs/class/corlib/Test/System/TypedReferenceCas.cs
+++ b/mcs/class/corlib/Test/System/TypedReferenceCas.cs
@@ -51,7 +51,7 @@ namespace MonoCasTests.System {
 		// when reflection is used (i.e. it gets testable).
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		[ReflectionPermission (SecurityAction.Deny, MemberAccess = true)]
 		[ExpectedException (typeof (SecurityException))]
 		public void MakeTypedReference ()
diff --git a/mcs/class/corlib/Test/System/TypedReferenceTest.cs b/mcs/class/corlib/Test/System/TypedReferenceTest.cs
index 9c28041c8ba..5eeaeb24289 100644
--- a/mcs/class/corlib/Test/System/TypedReferenceTest.cs
+++ b/mcs/class/corlib/Test/System/TypedReferenceTest.cs
@@ -59,7 +59,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void MakeTypedReference ()
 		{
 			var o = new CClass () { a = new AStruct () { b = "5" }};
diff --git a/mcs/class/corlib/Test/System/ValueTypeTest.cs b/mcs/class/corlib/Test/System/ValueTypeTest.cs
index c820f9f6687..476dfbb2852 100644
--- a/mcs/class/corlib/Test/System/ValueTypeTest.cs
+++ b/mcs/class/corlib/Test/System/ValueTypeTest.cs
@@ -52,7 +52,7 @@ namespace MonoTests.System
 		}
 
 		[Test]
-		[Category ("InterpreterNotWorking")]
+		[Category ("NotWorkingRuntimeInterpreter")]
 		public void TestEquals_Nullable ()
 		{
 			NullableStruct f1 = new NullableStruct { f = 5 };