changeset 103:da2ebe220a00

Migrate atomic.* test descriptions to new API.
author shade
date Fri, 14 Mar 2014 01:35:49 +0400
parents f1febba5f556
children 9f6496370824
files tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-boolean.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-array.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-updater.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-array.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-updater.xml tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml
diffstat 7 files changed, 336 insertions(+), 336 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-boolean.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-boolean.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -47,14 +47,14 @@
         </unmatched>
     </template>
 
-    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests$CAS_CAS" />
-    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests$CAS_GetAndSet" />
-    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests$CAS_WCAS" />
+    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests.CAS_CAS" />
+    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests.CAS_GetAndSet" />
+    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests.CAS_WCAS" />
 
-    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests$GetAndSet_GetAndSet" />
-    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests$GetAndSet_WCAS" />
+    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests.GetAndSet_GetAndSet" />
+    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests.GetAndSet_WCAS" />
 
-    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests$WCAS_WCAS" />
+    <test template="atomicBoolean" name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanPairwiseTests.WCAS_WCAS" />
 
     <test name="org.openjdk.jcstress.tests.atomics.booleans.AtomicBooleanInitialValueTest">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-array.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-array.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -73,7 +73,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_AddAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_AddAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -92,7 +92,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -111,7 +111,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -130,7 +130,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -149,7 +149,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -168,7 +168,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -187,7 +187,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -206,7 +206,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -225,7 +225,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -244,7 +244,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$AddAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.AddAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -263,7 +263,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -282,7 +282,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -301,7 +301,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -320,7 +320,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -339,7 +339,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -358,7 +358,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -377,7 +377,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -396,7 +396,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -415,7 +415,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$DecAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.DecAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -434,7 +434,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -453,7 +453,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -472,7 +472,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -491,7 +491,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -510,7 +510,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -529,7 +529,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -548,7 +548,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -567,7 +567,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndAdd_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndAdd_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -586,7 +586,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -605,7 +605,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -624,7 +624,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -643,7 +643,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -662,7 +662,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -681,7 +681,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -700,7 +700,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndDec_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndDec_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -719,7 +719,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndInc_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndInc_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -738,7 +738,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndInc_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndInc_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -757,7 +757,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndInc_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndInc_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -776,7 +776,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndInc_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndInc_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -795,7 +795,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndInc_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndInc_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -814,7 +814,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndInc_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndInc_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -833,7 +833,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndSet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndSet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -852,7 +852,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndSet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndSet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -871,7 +871,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndSet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndSet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -890,7 +890,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndSet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndSet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -909,7 +909,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$GetAndSet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.GetAndSet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -928,7 +928,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$IncAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.IncAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -947,7 +947,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$IncAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.IncAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -966,7 +966,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$IncAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.IncAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -985,7 +985,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$IncAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.IncAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -1004,7 +1004,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$Set_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.Set_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -1023,7 +1023,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$CAS_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.CAS_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -1042,7 +1042,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$CAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.CAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -1061,7 +1061,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$CAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.CAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -1080,7 +1080,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$WCAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.WCAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
@@ -1104,7 +1104,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests$WCAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerArrayPairwiseTests.WCAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerArray pair-wise operations.</description>
         <case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-updater.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer-updater.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -26,7 +26,7 @@
 -->
 <testsuite>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_AddAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_AddAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -45,7 +45,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -64,7 +64,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -83,7 +83,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -102,7 +102,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -121,7 +121,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -140,7 +140,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -159,7 +159,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -178,7 +178,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -197,7 +197,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$AddAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.AddAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -216,7 +216,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -235,7 +235,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -254,7 +254,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -273,7 +273,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -292,7 +292,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -311,7 +311,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -330,7 +330,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -349,7 +349,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -368,7 +368,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$DecAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.DecAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -387,7 +387,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -406,7 +406,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -425,7 +425,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -444,7 +444,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -463,7 +463,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -482,7 +482,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -501,7 +501,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -520,7 +520,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndAdd_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndAdd_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -539,7 +539,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -558,7 +558,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -577,7 +577,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -596,7 +596,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -615,7 +615,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -634,7 +634,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -653,7 +653,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndDec_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndDec_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -672,7 +672,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndInc_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndInc_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -691,7 +691,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndInc_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndInc_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -710,7 +710,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndInc_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndInc_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -729,7 +729,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndInc_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndInc_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -748,7 +748,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndInc_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndInc_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -767,7 +767,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndInc_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndInc_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -786,7 +786,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndSet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndSet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -805,7 +805,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndSet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndSet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -824,7 +824,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndSet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndSet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -843,7 +843,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndSet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndSet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -862,7 +862,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$GetAndSet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.GetAndSet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -881,7 +881,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$IncAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.IncAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -900,7 +900,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$IncAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.IncAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -919,7 +919,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$IncAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.IncAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -938,7 +938,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$IncAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.IncAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -957,7 +957,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$Set_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.Set_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -976,7 +976,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$CAS_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.CAS_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -995,7 +995,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$CAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.CAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -1014,7 +1014,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$CAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.CAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -1033,7 +1033,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$WCAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.WCAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
@@ -1057,7 +1057,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests$WCAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerFieldUpdaterPairwiseTests.WCAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicIntegerFieldUpdater pair-wise operations.</description>
         <case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-integer.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -63,7 +63,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_AddAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_AddAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -82,7 +82,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -101,7 +101,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -120,7 +120,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -139,7 +139,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -158,7 +158,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -177,7 +177,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -196,7 +196,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -215,7 +215,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -234,7 +234,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$AddAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.AddAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -253,7 +253,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -272,7 +272,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -291,7 +291,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -310,7 +310,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -329,7 +329,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -348,7 +348,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -367,7 +367,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -386,7 +386,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -405,7 +405,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$DecAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.DecAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -424,7 +424,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -443,7 +443,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -462,7 +462,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -481,7 +481,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -500,7 +500,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -519,7 +519,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -538,7 +538,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -557,7 +557,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndAdd_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndAdd_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -576,7 +576,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -595,7 +595,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -614,7 +614,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -633,7 +633,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -652,7 +652,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -671,7 +671,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -690,7 +690,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndDec_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndDec_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -709,7 +709,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndInc_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndInc_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -728,7 +728,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndInc_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndInc_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -747,7 +747,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndInc_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndInc_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -766,7 +766,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndInc_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndInc_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -785,7 +785,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndInc_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndInc_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -804,7 +804,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndInc_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndInc_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -823,7 +823,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndSet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndSet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -842,7 +842,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndSet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndSet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -861,7 +861,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndSet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndSet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -880,7 +880,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndSet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndSet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -899,7 +899,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$GetAndSet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.GetAndSet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -918,7 +918,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$IncAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.IncAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -937,7 +937,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$IncAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.IncAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -956,7 +956,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$IncAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.IncAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -975,7 +975,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$IncAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.IncAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -994,7 +994,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$Set_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.Set_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -1013,7 +1013,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$CAS_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.CAS_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -1032,7 +1032,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$CAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.CAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -1051,7 +1051,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$CAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.CAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -1070,7 +1070,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$WCAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.WCAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
@@ -1094,7 +1094,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests$WCAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.integer.AtomicIntegerPairwiseTests.WCAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicInteger pair-wise operations.</description>
         <case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-array.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-array.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -73,7 +73,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_AddAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_AddAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -92,7 +92,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -111,7 +111,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -130,7 +130,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -149,7 +149,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -168,7 +168,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -187,7 +187,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -206,7 +206,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -225,7 +225,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -244,7 +244,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$AddAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.AddAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -263,7 +263,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -282,7 +282,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -301,7 +301,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -320,7 +320,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -339,7 +339,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -358,7 +358,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -377,7 +377,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -396,7 +396,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -415,7 +415,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$DecAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.DecAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -434,7 +434,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -453,7 +453,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -472,7 +472,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -491,7 +491,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -510,7 +510,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -529,7 +529,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -548,7 +548,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -567,7 +567,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndAdd_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndAdd_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -586,7 +586,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -605,7 +605,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -624,7 +624,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -643,7 +643,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -662,7 +662,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -681,7 +681,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -700,7 +700,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndDec_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndDec_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -719,7 +719,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndInc_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndInc_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -738,7 +738,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndInc_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndInc_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -757,7 +757,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndInc_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndInc_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -776,7 +776,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndInc_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndInc_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -795,7 +795,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndInc_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndInc_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -814,7 +814,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndInc_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndInc_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -833,7 +833,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndSet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndSet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -852,7 +852,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndSet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndSet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -871,7 +871,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndSet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndSet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -890,7 +890,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndSet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndSet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -909,7 +909,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$GetAndSet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.GetAndSet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -928,7 +928,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$IncAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.IncAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -947,7 +947,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$IncAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.IncAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -966,7 +966,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$IncAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.IncAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -985,7 +985,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$IncAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.IncAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -1004,7 +1004,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$Set_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.Set_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -1023,7 +1023,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$CAS_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.CAS_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -1042,7 +1042,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$CAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.CAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -1061,7 +1061,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$CAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.CAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -1080,7 +1080,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$WCAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.WCAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
@@ -1104,7 +1104,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests$WCAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongArrayPairwiseTests.WCAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongArray pair-wise operations.</description>
         <case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-updater.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long-updater.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -26,7 +26,7 @@
 -->
 <testsuite>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_AddAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_AddAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -45,7 +45,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -64,7 +64,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -83,7 +83,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -102,7 +102,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -121,7 +121,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -140,7 +140,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -159,7 +159,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -178,7 +178,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -197,7 +197,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$AddAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.AddAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -216,7 +216,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -235,7 +235,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -254,7 +254,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -273,7 +273,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -292,7 +292,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -311,7 +311,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -330,7 +330,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -349,7 +349,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -368,7 +368,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$DecAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.DecAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -387,7 +387,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -406,7 +406,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -425,7 +425,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -444,7 +444,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -463,7 +463,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -482,7 +482,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -501,7 +501,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -520,7 +520,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndAdd_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndAdd_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -539,7 +539,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -558,7 +558,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -577,7 +577,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -596,7 +596,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -615,7 +615,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -634,7 +634,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -653,7 +653,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndDec_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndDec_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -672,7 +672,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndInc_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndInc_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -691,7 +691,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndInc_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndInc_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -710,7 +710,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndInc_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndInc_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -729,7 +729,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndInc_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndInc_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -748,7 +748,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndInc_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndInc_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -767,7 +767,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndInc_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndInc_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -786,7 +786,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndSet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndSet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -805,7 +805,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndSet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndSet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -824,7 +824,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndSet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndSet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -843,7 +843,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndSet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndSet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -862,7 +862,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$GetAndSet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.GetAndSet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -881,7 +881,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$IncAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.IncAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -900,7 +900,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$IncAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.IncAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -919,7 +919,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$IncAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.IncAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -938,7 +938,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$IncAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.IncAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -957,7 +957,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$Set_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.Set_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -976,7 +976,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$CAS_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.CAS_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -995,7 +995,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$CAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.CAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -1014,7 +1014,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$CAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.CAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -1033,7 +1033,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$WCAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.WCAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
@@ -1057,7 +1057,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests$WCAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongFieldUpdaterPairwiseTests.WCAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLongFieldUpdater pair-wise operations.</description>
         <case>
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml	Fri Mar 14 01:35:32 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/atomic-long.xml	Fri Mar 14 01:35:49 2014 +0400
@@ -63,7 +63,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_AddAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_AddAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -82,7 +82,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -101,7 +101,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -120,7 +120,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -139,7 +139,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -158,7 +158,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -177,7 +177,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -196,7 +196,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -215,7 +215,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -234,7 +234,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$AddAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.AddAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -253,7 +253,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -272,7 +272,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -291,7 +291,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_DecAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_DecAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -310,7 +310,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -329,7 +329,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -348,7 +348,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -367,7 +367,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -386,7 +386,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -405,7 +405,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$DecAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.DecAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -424,7 +424,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -443,7 +443,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -462,7 +462,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_GetAndAdd">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_GetAndAdd">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -481,7 +481,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -500,7 +500,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -519,7 +519,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -538,7 +538,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -557,7 +557,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndAdd_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndAdd_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -576,7 +576,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -595,7 +595,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -614,7 +614,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_GetAndDec">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_GetAndDec">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -633,7 +633,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -652,7 +652,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -671,7 +671,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -690,7 +690,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndDec_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndDec_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -709,7 +709,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndInc_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndInc_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -728,7 +728,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndInc_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndInc_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -747,7 +747,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndInc_GetAndInc">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndInc_GetAndInc">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -766,7 +766,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndInc_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndInc_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -785,7 +785,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndInc_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndInc_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -804,7 +804,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndInc_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndInc_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -823,7 +823,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndSet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndSet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -842,7 +842,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndSet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndSet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -861,7 +861,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndSet_GetAndSet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndSet_GetAndSet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -880,7 +880,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndSet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndSet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -899,7 +899,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$GetAndSet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.GetAndSet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -918,7 +918,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$IncAndGet_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.IncAndGet_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -937,7 +937,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$IncAndGet_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.IncAndGet_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -956,7 +956,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$IncAndGet_IncAndGet">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.IncAndGet_IncAndGet">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -975,7 +975,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$IncAndGet_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.IncAndGet_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -994,7 +994,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$Set_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.Set_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -1013,7 +1013,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$CAS_CAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.CAS_CAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -1032,7 +1032,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$CAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.CAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -1051,7 +1051,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$CAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.CAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -1070,7 +1070,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$WCAS_WCAS">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.WCAS_WCAS">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>
@@ -1094,7 +1094,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests$WCAS_Set">
+    <test name="org.openjdk.jcstress.tests.atomics.longs.AtomicLongPairwiseTests.WCAS_Set">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>Tests the atomicity of AtomicLong pair-wise operations.</description>
         <case>