diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java
index f8973e86fb7..2b01874b439 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/AllXlcErrorParserTests.java
@@ -19,19 +19,19 @@ public class AllXlcErrorParserTests {
 	}
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Testsuite for xlc compiler error parser");
+		TestSuite suite = new TestSuite("Testsuite for xlc compiler error parser");
 		//$JUnit-BEGIN$
-		suite.addTestSuite(TestUndeclIdent.class);
-		suite.addTestSuite(TestMissingArg.class);
-		suite.addTestSuite(TestFloatingPoint.class);
-		suite.addTestSuite(TestFuncArg.class);
-		suite.addTestSuite(TestOperModi.class);
-		suite.addTestSuite(TestConditional.class);
-		suite.addTestSuite(TestSyntaxError.class);
-		suite.addTestSuite(TestNoFuncProto.class);
+		suite.addTestSuite(TestInformationalMessage_1.class);
+		suite.addTestSuite(TestWarning_1.class);
+		suite.addTestSuite(TestError_1.class);
+		suite.addTestSuite(TestSevereError_1.class);
+		suite.addTestSuite(TestSevereError_2.class);
+		suite.addTestSuite(TestSevereError_3.class);
+		suite.addTestSuite(TestSevereError_4.class);
+		suite.addTestSuite(TestSevereError_5.class);
+		suite.addTestSuite(TestUnrecoverableError_1.class);
+
 		suite.addTestSuite(TestCompatibility.class);
-		suite.addTestSuite(TestUnrecoverableError.class);
 		suite.addTestSuite(TestRedefinition.class);
 		suite.addTestSuite(TestRedeclaration.class);
 		suite.addTestSuite(TestLinkerUndefinedSymbol.class);
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestMissingArg.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java
similarity index 94%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestMissingArg.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java
index 6038d0b312d..c43dd1743cb 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestMissingArg.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestError_1.java
@@ -16,7 +16,7 @@ import junit.framework.TestCase;
 import org.eclipse.cdt.core.IMarkerGenerator;
 
 
-public class TestMissingArg extends TestCase {
+public class TestError_1 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -33,7 +33,7 @@ public class TestMissingArg extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_ERROR_RESOURCE, aix.getSeverity(0));
 		assertEquals("Missing argument(s).",aix.getMessage(0));
 	}
-	public TestMissingArg( String name)
+	public TestError_1( String name)
 	{
 		super(name);
 		err_msg = "\"temp8.c\", line 9.17: 1506-098 (E) "
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestConditional.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java
similarity index 92%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestConditional.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java
index e75f305d4fe..4751d1a7f30 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestConditional.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestInformationalMessage_1.java
@@ -16,7 +16,7 @@ import junit.framework.TestCase;
 import org.eclipse.cdt.core.IMarkerGenerator;
 
 
-public class TestConditional extends TestCase {
+public class TestInformationalMessage_1 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -32,7 +32,7 @@ public class TestConditional extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_INFO, aix.getSeverity(0));
 		assertEquals("The then branch of conditional is an empty statement.",aix.getMessage(0));
 	}
-	public TestConditional( String name)
+	public TestInformationalMessage_1( String name)
 	{
 		super(name);
 		err_msg = "\"temp8.c\", line 12.9: 1506-478 (I) " + 
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSyntaxError.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java
similarity index 93%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSyntaxError.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java
index 280ee47820d..22d8cec3a3f 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSyntaxError.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_1.java
@@ -14,7 +14,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.cdt.core.IMarkerGenerator;
 
-public class TestSyntaxError extends TestCase {
+public class TestSevereError_1 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -31,7 +31,7 @@ public class TestSyntaxError extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_ERROR_RESOURCE, aix.getSeverity(0));
 		assertEquals("Syntax error: possible missing ')'?",aix.getMessage(0));
 	}
-	public TestSyntaxError( String name)
+	public TestSevereError_1( String name)
 	{
 		super(name);
 		err_msg = "\"temp1.c\", line 5.1: 1506-276 (S) " 
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUndeclIdent.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java
similarity index 93%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUndeclIdent.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java
index 0fc1b80145b..6f6f3b7e040 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUndeclIdent.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_2.java
@@ -15,7 +15,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.cdt.core.IMarkerGenerator;
 
-public class TestUndeclIdent extends TestCase {
+public class TestSevereError_2 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -32,7 +32,7 @@ public class TestUndeclIdent extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_ERROR_RESOURCE, aix.getSeverity(0));
 		assertEquals("Undeclared identifier y.",aix.getMessage(0));
 	}
-	public TestUndeclIdent( String name)
+	public TestSevereError_2( String name)
 	{
 		super(name);
 		err_msg = "\"temp5.c\", line 5.9: 1506-045 (S) " + 
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestFloatingPoint.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java
similarity index 93%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestFloatingPoint.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java
index a48256b88dd..6aebad7b05b 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestFloatingPoint.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_3.java
@@ -16,7 +16,7 @@ import junit.framework.TestCase;
 import org.eclipse.cdt.core.IMarkerGenerator;
 
 
-public class TestFloatingPoint extends TestCase {
+public class TestSevereError_3 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -34,7 +34,7 @@ public class TestFloatingPoint extends TestCase {
 		assertEquals("Floating point constant 10.23.3 is not valid",
 					aix.getMessage(0));
 	}
-	public TestFloatingPoint( String name)
+	public TestSevereError_3( String name)
 	{
 		super(name);
 		err_msg = "\"temp9.c\", line 11.18: 1506-189 (S) " + 
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestFuncArg.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java
similarity index 94%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestFuncArg.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java
index 9a4ee2c56f0..eac63f5e2bf 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestFuncArg.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_4.java
@@ -15,7 +15,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.cdt.core.IMarkerGenerator;
 
-public class TestFuncArg extends TestCase {
+public class TestSevereError_4 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -34,7 +34,7 @@ public class TestFuncArg extends TestCase {
 				"\"int\" and \"char*\" is not allowed.",
 					aix.getMessage(0));
 	}
-	public TestFuncArg( String name)
+	public TestSevereError_4( String name)
 	{
 		super(name);
 		err_msg = "\"temp9.c\", line 12.18: 1506-280 (S) " +
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestOperModi.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java
similarity index 93%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestOperModi.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java
index fa1f6997896..471ae87a030 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestOperModi.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestSevereError_5.java
@@ -15,7 +15,7 @@ import junit.framework.TestCase;
 import org.eclipse.cdt.core.IMarkerGenerator;
 
 
-public class TestOperModi extends TestCase {
+public class TestSevereError_5 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -32,7 +32,7 @@ public class TestOperModi extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_ERROR_RESOURCE, aix.getSeverity(0));
 		assertEquals("Operand must be a modifiable lvalue.",aix.getMessage(0));
 	}
-	public TestOperModi( String name)
+	public TestSevereError_5( String name)
 	{
 		super(name);
 		err_msg = "\"temp9.c\", line 13.9: 1506-025 (S) " + 
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java
similarity index 92%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java
index ee9962c0e7f..19c731ded82 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestUnrecoverableError_1.java
@@ -14,7 +14,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.cdt.core.IMarkerGenerator;
 
-public class TestUnrecoverableError extends TestCase {
+public class TestUnrecoverableError_1 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -31,7 +31,7 @@ public class TestUnrecoverableError extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_ERROR_RESOURCE, aix.getSeverity(0));
 		assertEquals("INTERNAL COMPILER ERROR",aix.getMessage(0));
 	}
-	public TestUnrecoverableError( String name)
+	public TestUnrecoverableError_1( String name)
 	{
 		super(name);
 		err_msg = "\"temp1.c\", line 5.1: 1506-001 (U) "
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestNoFuncProto.java b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java
similarity index 93%
rename from xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestNoFuncProto.java
rename to xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java
index f212db3e16a..606f601b25f 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestNoFuncProto.java
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/src/org/eclipse/cdt/errorparsers/xlc/tests/TestWarning_1.java
@@ -14,7 +14,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.cdt.core.IMarkerGenerator;
 
-public class TestNoFuncProto extends TestCase {
+public class TestWarning_1 extends TestCase {
 	String err_msg;
 	/**
 	 * This function tests parseLine function of the
@@ -30,7 +30,7 @@ public class TestNoFuncProto extends TestCase {
 		assertEquals(IMarkerGenerator.SEVERITY_WARNING, aix.getSeverity(0));
 		assertEquals("No function prototype given for \"printf\".",aix.getMessage(0));
 	}
-	public TestNoFuncProto( String name)
+	public TestWarning_1( String name)
 	{
 		super(name);
 		err_msg = "\"temp1.c\", line 5.9: 1506-304 (W) "