compilationParticipant---> validationParticipant
classpathVariableInitializer-->JsGlobalScopeVariableInitializer
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties
index e27a896..3ae08c4 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.properties
@@ -15,5 +15,5 @@
 pluginName=JSDT Tests - Model
 providerName=Eclipse.org
 
-classpathVariableInitializer.deprecated.0 = Test deprecated flag
-classpathVariableInitializer.deprecated.1 = A deprecated and read-only initializer
\ No newline at end of file
+JsGlobalScopeVariableInitializer.deprecated.0 = Test deprecated flag
+JsGlobalScopeVariableInitializer.deprecated.1 = A deprecated and read-only initializer
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
index 1ad6b8e..083ac32 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
@@ -2,32 +2,32 @@
 <?eclipse version="3.0"?>
 <plugin>
    	<!-- Classpath variable initializer -->
-	<extension point = "org.eclipse.wst.jsdt.core.classpathVariableInitializer">
-		<classpathVariableInitializer
+	<extension point = "org.eclipse.wst.jsdt.core.JsGlobalScopeVariableInitializer">
+		<JsGlobalScopeVariableInitializer
 			variable="TEST_LIB"
 			class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"/>
-		<classpathVariableInitializer
+		<JsGlobalScopeVariableInitializer
 			variable="TEST_SRC"
 			class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"/>
-		<classpathVariableInitializer
+		<JsGlobalScopeVariableInitializer
 			variable="TEST_ROOT"
 			class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"/>
-  <classpathVariableInitializer
+  <JsGlobalScopeVariableInitializer
         class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"
-        deprecated="%classpathVariableInitializer.deprecated.0"
+        deprecated="%JsGlobalScopeVariableInitializer.deprecated.0"
         variable="TEST_DEPRECATED">
-  </classpathVariableInitializer>
-  <classpathVariableInitializer
+  </JsGlobalScopeVariableInitializer>
+  <JsGlobalScopeVariableInitializer
         class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"
         readOnly="true"
         variable="TEST_READ_ONLY">
-  </classpathVariableInitializer>
-  <classpathVariableInitializer
+  </JsGlobalScopeVariableInitializer>
+  <JsGlobalScopeVariableInitializer
         class="org.eclipse.wst.jsdt.core.tests.model.VariablesInitializer"
-        deprecated="%classpathVariableInitializer.deprecated.1"
+        deprecated="%JsGlobalScopeVariableInitializer.deprecated.1"
         readOnly="true"
         variable="TEST_DEPRECATED_READ_ONLY">
-  </classpathVariableInitializer>
+  </JsGlobalScopeVariableInitializer>
 	</extension>		
 
 	<!-- Classpath container initializer -->
@@ -53,15 +53,15 @@
 	</extension>
 	
 	<!-- Compilation participant -->
-	 <extension point="org.eclipse.wst.jsdt.core.compilationParticipant">
-	   <compilationParticipant
-          class="org.eclipse.wst.jsdt.core.tests.model.TestCompilationParticipant"
+	 <extension point="org.eclipse.wst.jsdt.core.validationParticipant">
+	   <validationParticipant
+          class="org.eclipse.wst.jsdt.core.tests.model.TestvalidationParticipant"
           createsProblems="true"
-          id="org.eclipse.wst.jsdt.core.tests.model.compilationparticipant"
+          id="org.eclipse.wst.jsdt.core.tests.model.validationParticipant"
           requiredSourceLevel="1.4"
           modifiesEnvironment="true">
        <requires id="non.existing"/>
-    </compilationParticipant>
+    </validationParticipant>
 	 </extension>
 	
 </plugin>
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerStatementsRecoveryTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerStatementsRecoveryTests.java
index 57c507f..36b5b58 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerStatementsRecoveryTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerStatementsRecoveryTests.java
@@ -201,7 +201,7 @@
  * Cleanup after the previous test.
  */
 public void tearDown() throws Exception {
-	TestCompilationParticipant.PARTICIPANT = null;
+	TestvalidationParticipant.PARTICIPANT = null;
 	if (this.workingCopy != null) {
 		this.workingCopy.discardWorkingCopy();
 	}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerTests.java
index e502a32..fd5564b 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ReconcilerTests.java
@@ -27,7 +27,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.wst.jsdt.core.*;
 import org.eclipse.wst.jsdt.core.compiler.CategorizedProblem;
-import org.eclipse.wst.jsdt.core.compiler.CompilationParticipant;
+import org.eclipse.wst.jsdt.core.compiler.validationParticipant;
 import org.eclipse.wst.jsdt.core.compiler.IProblem;
 import org.eclipse.wst.jsdt.core.compiler.ReconcileContext;
 import org.eclipse.wst.jsdt.core.dom.AST;
@@ -66,11 +66,11 @@
 		}		
 	}
 	
-	class ReconcileParticipant extends CompilationParticipant {
+	class ReconcileParticipant extends validationParticipant {
 		IJavaElementDelta delta;
 		org.eclipse.wst.jsdt.core.dom.CompilationUnit ast;
 		ReconcileParticipant() {
-			TestCompilationParticipant.PARTICIPANT = this;
+			TestvalidationParticipant.PARTICIPANT = this;
 		}
 		public boolean isActive(IJavaProject project) {
 			return true;
@@ -237,7 +237,7 @@
  * Cleanup after the previous test.
  */
 public void tearDown() throws Exception {
-	TestCompilationParticipant.PARTICIPANT = null;
+	TestvalidationParticipant.PARTICIPANT = null;
 	if (this.workingCopy != null) {
 		this.workingCopy.discardWorkingCopy();
 	}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/TestCompilationParticipant.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/TestvalidationParticipant.java
similarity index 82%
rename from tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/TestCompilationParticipant.java
rename to tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/TestvalidationParticipant.java
index e242dfd..a10b5ce 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/TestCompilationParticipant.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/TestvalidationParticipant.java
@@ -11,12 +11,12 @@
 package org.eclipse.wst.jsdt.core.tests.model;
 
 import org.eclipse.wst.jsdt.core.IJavaProject;
-import org.eclipse.wst.jsdt.core.compiler.CompilationParticipant;
+import org.eclipse.wst.jsdt.core.compiler.validationParticipant;
 import org.eclipse.wst.jsdt.core.compiler.ReconcileContext;
 
-public class TestCompilationParticipant extends CompilationParticipant {
+public class TestvalidationParticipant extends validationParticipant {
 	
-	public static CompilationParticipant PARTICIPANT;
+	public static validationParticipant PARTICIPANT;
 
 	public boolean isActive(IJavaProject project) {
 		return PARTICIPANT != null && PARTICIPANT.isActive(project);
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/VariablesInitializer.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/VariablesInitializer.java
index 1c132a1..7613f59 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/VariablesInitializer.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/VariablesInitializer.java
@@ -11,11 +11,11 @@
 package org.eclipse.wst.jsdt.core.tests.model;
 
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.jsdt.core.ClasspathVariableInitializer;
+import org.eclipse.wst.jsdt.core.JsGlobalScopeVariableInitializer;
 import org.eclipse.wst.jsdt.core.JavaCore;
 import org.eclipse.wst.jsdt.core.JavaModelException;
 
-public class VariablesInitializer extends ClasspathVariableInitializer {
+public class VariablesInitializer extends JsGlobalScopeVariableInitializer {
 
 	public static ITestInitializer initializer;