Refactored: ClasspathContainer -----> JsGlobalScopeContainer
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 7cf07e1..1ad6b8e 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/plugin.xml
@@ -31,8 +31,8 @@
 	</extension>		
 
 	<!-- Classpath container initializer -->
-	<extension point = "org.eclipse.wst.jsdt.core.classpathContainerInitializer">
-		<classpathContainerInitializer
+	<extension point = "org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer">
+		<JsGlobalScopeContainerInitializer
 			id="org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"
 			class="org.eclipse.wst.jsdt.core.tests.model.ContainerInitializer"/>
 	</extension>
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java
index d00cdce..5b737a0 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathInitializerTests.java
@@ -20,7 +20,7 @@
 import org.eclipse.wst.jsdt.core.compiler.CharOperation;
 import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
 import org.eclipse.wst.jsdt.internal.core.JavaModelStatus;
-import org.eclipse.wst.jsdt.internal.core.UserLibraryClasspathContainer;
+import org.eclipse.wst.jsdt.internal.core.UserLibraryJsGlobalScopeContainer;
 import org.eclipse.wst.jsdt.internal.core.UserLibraryManager;
 
 import junit.framework.Test;
@@ -51,7 +51,7 @@
 
 public static class DefaultContainerInitializer implements ContainerInitializer.ITestInitializer {
 	
-	public static class DefaultContainer implements IClasspathContainer {
+	public static class DefaultContainer implements IJsGlobalScopeContainer {
 		char[][] libPaths;
 		public DefaultContainer(char[][] libPaths) {
 			this.libPaths = libPaths;
@@ -73,13 +73,13 @@
 			return "Test container";
 		}
 		public int getKind() {
-			return IClasspathContainer.K_APPLICATION;
+			return IJsGlobalScopeContainer.K_APPLICATION;
 		}
 		public IPath getPath() {
 			return new Path("org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER");
 		}
 		/* (non-Javadoc)
-		 * @see org.eclipse.wst.jsdt.core.IClasspathContainer#resolvedLibraryImport(java.lang.String)
+		 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
 		 */
 		public String[] resolvedLibraryImport(String a) {
 			return new String[] {a};
@@ -112,10 +112,10 @@
 	public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
 		if (containerValues == null) return;
 		try {
-			JavaCore.setClasspathContainer(
+			JavaCore.setJsGlobalScopeContainer(
 				containerPath, 
 				new IJavaProject[] {project},
-				new IClasspathContainer[] {(IClasspathContainer)containerValues.get(project.getElementName())}, 
+				new IJsGlobalScopeContainer[] {(IJsGlobalScopeContainer)containerValues.get(project.getElementName())}, 
 				null);
 		} catch (CoreException e) {
 			this.exception = e;
@@ -132,10 +132,10 @@
 	}
 	public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
 		hasRun = true;
-		JavaCore.setClasspathContainer(
+		JavaCore.setJsGlobalScopeContainer(
 			containerPath, 
 			new IJavaProject[] {project}, 
-			new IClasspathContainer[] { null }, 
+			new IJsGlobalScopeContainer[] { null }, 
 			null);
 	}
 }
@@ -785,8 +785,8 @@
 				new String[] {}, 
 				new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"}, 
 				"");
-		IClasspathContainer classpathContainer = JavaCore.getClasspathContainer(new Path("org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"), p1);
-		assertClasspathEquals(classpathContainer.getClasspathEntries(), "");
+		IJsGlobalScopeContainer JsGlobalScopeContainer = JavaCore.getJsGlobalScopeContainer(new Path("org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"), p1);
+		assertClasspathEquals(JsGlobalScopeContainer.getClasspathEntries(), "");
 	} finally {
 		stopDeltas();
 		deleteProject("P1");
@@ -1249,11 +1249,11 @@
 public void testUserLibraryInitializer1() throws CoreException {
 	try {
 		// Create new user library "SWT"
-		ClasspathContainerInitializer initializer= JavaCore.getClasspathContainerInitializer(JavaCore.USER_LIBRARY_CONTAINER_ID);
+		JsGlobalScopeContainerInitializer initializer= JavaCore.getJsGlobalScopeContainerInitializer(JavaCore.USER_LIBRARY_CONTAINER_ID);
 		String libraryName = "SWT";
 		IPath containerPath = new Path(JavaCore.USER_LIBRARY_CONTAINER_ID);
-		UserLibraryClasspathContainer containerSuggestion = new UserLibraryClasspathContainer(libraryName);
-		initializer.requestClasspathContainerUpdate(containerPath.append(libraryName), null, containerSuggestion);
+		UserLibraryJsGlobalScopeContainer containerSuggestion = new UserLibraryJsGlobalScopeContainer(libraryName);
+		initializer.requestJsGlobalScopeContainerUpdate(containerPath.append(libraryName), null, containerSuggestion);
 
 		// Create java project
 		createJavaProject("p61872");
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java
index 8555917..1a8da6b 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ClasspathTests.java
@@ -38,7 +38,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.wst.jsdt.core.IAccessRule;
 import org.eclipse.wst.jsdt.core.IClasspathAttribute;
-import org.eclipse.wst.jsdt.core.IClasspathContainer;
+import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
 import org.eclipse.wst.jsdt.core.IClasspathEntry;
 import org.eclipse.wst.jsdt.core.ICompilationUnit;
 import org.eclipse.wst.jsdt.core.IJavaElementDelta;
@@ -57,7 +57,7 @@
 
 public class ClasspathTests extends ModifyingResourceTests {
 
-	public class TestContainer implements IClasspathContainer {
+	public class TestContainer implements IJsGlobalScopeContainer {
 		IPath path;
 		IClasspathEntry[] entries;
 		TestContainer(IPath path, IClasspathEntry[] entries){
@@ -69,7 +69,7 @@
 		public String getDescription() { return this.path.toString(); 	}
 		public int getKind() { return 0; }
 		/* (non-Javadoc)
-		 * @see org.eclipse.wst.jsdt.core.IClasspathContainer#resolvedLibraryImport(java.lang.String)
+		 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
 		 */
 		public String[] resolvedLibraryImport(String a) {
 			return new String[] {a};
@@ -780,10 +780,10 @@
 			this.createJavaProject("P1", new String[] {"src1"}, "bin1"),
 		};
 
-		JavaCore.setClasspathContainer(
+		JavaCore.setJsGlobalScopeContainer(
 		new Path("container/default"), 
 			new IJavaProject[]{ p[0] },
-			new IClasspathContainer[] {
+			new IJsGlobalScopeContainer[] {
 				new TestContainer(new Path("container/default"),
 					new IClasspathEntry[]{
 						JavaCore.newSourceEntry(new Path("/P0/src0")),
@@ -2095,10 +2095,10 @@
 		startDeltas();
 
 		// create container
-		JavaCore.setClasspathContainer(
+		JavaCore.setJsGlobalScopeContainer(
 			new Path("container/default"), 
 			new IJavaProject[]{ proj },
-			new IClasspathContainer[] {
+			new IJsGlobalScopeContainer[] {
 				new TestContainer(
 					new Path("container/default"),
 					new IClasspathEntry[] {}) 
@@ -2156,10 +2156,10 @@
 		IJavaProject p1 = this.createJavaProject("P1", new String[] {""}, "");
 
 		// create container
-		JavaCore.setClasspathContainer(
+		JavaCore.setJsGlobalScopeContainer(
 			new Path("container/default"), 
 			new IJavaProject[]{ p1 },
-			new IClasspathContainer[] {
+			new IJsGlobalScopeContainer[] {
 				new TestContainer(
 					new Path("container/default"),
 					new IClasspathEntry[] {
@@ -2886,7 +2886,7 @@
 			p[i] = this.createJavaProject(projectNames[i], new String[] {""}, "");
 		}
 
-		IClasspathContainer[] containers = new IClasspathContainer[]{ 
+		IJsGlobalScopeContainer[] containers = new IJsGlobalScopeContainer[]{ 
 			new TestContainer(
 				new Path("container0/default"), 
 				new IClasspathEntry[]{ JavaCore.newProjectEntry(p[3].getPath()) }),
@@ -2928,22 +2928,22 @@
 
 			// update container paths
 			if (i == p.length - 1){
-				JavaCore.setClasspathContainer(
+				JavaCore.setJsGlobalScopeContainer(
 					containers[0].getPath(),
 					new IJavaProject[]{ p[0] },
-					new IClasspathContainer[] { containers[0] },
+					new IJsGlobalScopeContainer[] { containers[0] },
 					null);
 
-				JavaCore.setClasspathContainer(
+				JavaCore.setJsGlobalScopeContainer(
 					containers[1].getPath(),
 					new IJavaProject[]{ p[2] },
-					new IClasspathContainer[] { containers[1] },
+					new IJsGlobalScopeContainer[] { containers[1] },
 					null);
 
-				JavaCore.setClasspathContainer(
+				JavaCore.setJsGlobalScopeContainer(
 					containers[2].getPath(),
 					new IJavaProject[]{ p[3] },
-					new IClasspathContainer[] { containers[2] },
+					new IJsGlobalScopeContainer[] { containers[2] },
 					null);
 			}
 			
@@ -2968,7 +2968,7 @@
 			p[i] = this.createJavaProject(projectNames[i], new String[] {""}, "");
 		}
 
-		class LocalTestContainer implements IClasspathContainer {
+		class LocalTestContainer implements IJsGlobalScopeContainer {
 			IPath path;
 			IClasspathEntry[] entries;
 			LocalTestContainer(IPath path, IClasspathEntry[] entries){
@@ -2980,14 +2980,14 @@
 			public String getDescription() { return null; 	}
 			public int getKind() { return 0; }
 			/* (non-Javadoc)
-			 * @see org.eclipse.wst.jsdt.core.IClasspathContainer#resolvedLibraryImport(java.lang.String)
+			 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
 			 */
 			public String[] resolvedLibraryImport(String a) {
 				return new String[] {a};
 			}
 		}
 
-		IClasspathContainer[] containers = new IClasspathContainer[]{ 
+		IJsGlobalScopeContainer[] containers = new IJsGlobalScopeContainer[]{ 
 			new LocalTestContainer(
 				new Path("container0/default"), 
 				new IClasspathEntry[]{ JavaCore.newProjectEntry(p[3].getPath()) }),
@@ -3029,10 +3029,10 @@
 
 			// update same container path for multiple projects
 			if (i == p.length - 1){
-				JavaCore.setClasspathContainer(
+				JavaCore.setJsGlobalScopeContainer(
 					containers[0].getPath(),
 					new IJavaProject[]{ p[0], p[2], p[3] },
-					new IClasspathContainer[] { containers[0], containers[1], containers[2] },
+					new IJsGlobalScopeContainer[] { containers[0], containers[1], containers[2] },
 					null);
 			}
 			
@@ -3160,7 +3160,7 @@
 					new Path("org.eclipse.wst.jsdt.core.tests.model.container/default"), 
 					new IClasspathEntry[] { JavaCore.newProjectEntry(new Path("/P1")) });
 				try {
-					JavaCore.setClasspathContainer(container.getPath(), new IJavaProject[] {getJavaProject("P2")}, new IClasspathContainer[] {container}, null);
+					JavaCore.setJsGlobalScopeContainer(container.getPath(), new IJavaProject[] {getJavaProject("P2")}, new IJsGlobalScopeContainer[] {container}, null);
 				} catch (JavaModelException e) {
 					e.printStackTrace();
 				}
@@ -3174,7 +3174,7 @@
 			new Path("org.eclipse.wst.jsdt.core.tests.model.container/default"), 
 			new IClasspathEntry[] {});
 		IJavaProject p2 = createJavaProject("P2", new String[] {}, new String[] {container.getPath().toString()}, "");
-		JavaCore.setClasspathContainer(container.getPath(), new IJavaProject[] {p2}, new IClasspathContainer[] {container}, null);
+		JavaCore.setJsGlobalScopeContainer(container.getPath(), new IJavaProject[] {p2}, new IJsGlobalScopeContainer[] {container}, null);
 		waitForAutoBuild();
 		getWorkspace().addResourceChangeListener(listener, IResourceChangeEvent.POST_CHANGE);
 		createFile("/P1/test.txt", "");
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests2.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests2.java
index f310a08..4a43ad8 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests2.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/CompletionTests2.java
@@ -28,7 +28,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.wst.jsdt.core.IAccessRule;
 import org.eclipse.wst.jsdt.core.IClasspathAttribute;
-import org.eclipse.wst.jsdt.core.IClasspathContainer;
+import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
 import org.eclipse.wst.jsdt.core.IClasspathEntry;
 import org.eclipse.wst.jsdt.core.ICompilationUnit;
 import org.eclipse.wst.jsdt.core.IJavaProject;
@@ -76,7 +76,7 @@
 		
 	public static class CompletionContainerInitializer implements ContainerInitializer.ITestInitializer {
 		
-		public static class DefaultContainer implements IClasspathContainer {
+		public static class DefaultContainer implements IJsGlobalScopeContainer {
 			char[][] libPaths;
 			boolean[] areExported;
 			String[] forbiddenReferences;
@@ -117,13 +117,13 @@
 				return "Test container";
 			}
 			public int getKind() {
-				return IClasspathContainer.K_APPLICATION;
+				return IJsGlobalScopeContainer.K_APPLICATION;
 			}
 			public IPath getPath() {
 				return new Path("org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER");
 			}
 			/* (non-Javadoc)
-			 * @see org.eclipse.wst.jsdt.core.IClasspathContainer#resolvedLibraryImport(java.lang.String)
+			 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer#resolvedLibraryImport(java.lang.String)
 			 */
 			public String[] resolvedLibraryImport(String a) {
 				return new String[] {a};
@@ -158,10 +158,10 @@
 		public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
 			if (containerValues == null) return;
 			try {
-				JavaCore.setClasspathContainer(
+				JavaCore.setJsGlobalScopeContainer(
 					containerPath, 
 					new IJavaProject[] {project},
-					new IClasspathContainer[] {(IClasspathContainer)containerValues.get(project.getElementName())}, 
+					new IJsGlobalScopeContainer[] {(IJsGlobalScopeContainer)containerValues.get(project.getElementName())}, 
 					null);
 			} catch (CoreException e) {
 				this.exception = e;
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ContainerInitializer.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ContainerInitializer.java
index 449c1da..a33a2f4 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ContainerInitializer.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/ContainerInitializer.java
@@ -12,12 +12,12 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.jsdt.core.ClasspathContainerInitializer;
-import org.eclipse.wst.jsdt.core.IClasspathContainer;
+import org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer;
+import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
 import org.eclipse.wst.jsdt.core.IJavaProject;
 import org.eclipse.wst.jsdt.core.compiler.libraries.LibraryLocation;
 
-public class ContainerInitializer extends ClasspathContainerInitializer {
+public class ContainerInitializer extends JsGlobalScopeContainerInitializer {
 	public static ITestInitializer initializer;
 	
 	public static interface ITestInitializer {
@@ -29,7 +29,7 @@
 		ContainerInitializer.initializer = initializer;
 	}
 	
-	public IClasspathContainer getFailureContainer(IPath containerPath, IJavaProject project) {
+	public IJsGlobalScopeContainer getFailureContainer(IPath containerPath, IJavaProject project) {
 		if (initializer == null || !initializer.allowFailureContainer()) return null;
 		return super.getFailureContainer(containerPath, project);
 	}
@@ -40,7 +40,7 @@
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.core.IClasspathContainerInitialzer#getLibraryLocation()
+	 * @see org.eclipse.wst.jsdt.core.IJsGlobalScopeContainerInitialzer#getLibraryLocation()
 	 */
 	public LibraryLocation getLibraryLocation() {
 		return null;
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/JavaSearchScopeTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/JavaSearchScopeTests.java
index 9a04548..7466075 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/JavaSearchScopeTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/JavaSearchScopeTests.java
@@ -127,7 +127,7 @@
  * Ensures that a Java search scope with APPLICATION_LIBRARIES only is correct
  * (classpath container case)
  */
-public void testApplicationLibrairiesClasspathContainer() throws CoreException {
+public void testApplicationLibrairiesJsGlobalScopeContainer() throws CoreException {
 	try {
 		ContainerInitializer.setInitializer(new ClasspathInitializerTests.DefaultContainerInitializer(new String[] {"P", "/P/lib.jar"}));
 		IJavaProject project = createJavaProject("P", new String[] {}, new String[] {"org.eclipse.wst.jsdt.core.tests.model.TEST_CONTAINER"}, "");
@@ -151,7 +151,7 @@
 			protected DefaultContainer newContainer(char[][] libPaths) {
 				return new DefaultContainer(libPaths) {
 					public int getKind() {
-						return IClasspathContainer.K_SYSTEM;
+						return IJsGlobalScopeContainer.K_SYSTEM;
 					}
 				};
 			}
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_in.js b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_in.js
index 580c51c..b869dc4 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_in.js
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_in.js
@@ -9,7 +9,7 @@
 				+ "} with values: " //$NON-NLS-1$

 				+ (org.eclipse.wst.jsdt.internal.compiler.util.Util.toString(respectiveContainers, 

 						new org.eclipse.wst.jsdt.internal.compiler.util.Util.Displayable(){ 

-							public String displayString(Object o) { return ((IClasspathContainer) o).getDescription(); }

+							public String displayString(Object o) { return ((IJsGlobalScopeContainer) o).getDescription(); }

 						}))

 					);

 		}

diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_out.js b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_out.js
index e43707e..03d8c66 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_out.js
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test183/A_out.js
@@ -20,7 +20,7 @@
 											new org.eclipse.wst.jsdt.internal.compiler.util.Util.Displayable() {

 												public String displayString(

 														Object o) {

-													return ((IClasspathContainer) o)

+													return ((IJsGlobalScopeContainer) o)

 															.getDescription();

 												}

 											})));

diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_in.js b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_in.js
index f257156..0225235 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_in.js
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_in.js
@@ -22,7 +22,7 @@
 													new org.eclipse.wst.jsdt.internal.compiler.util.Util.Displayable() {

 														public String displayString(

 																Object o) {

-															return ((IClasspathContainer) o)

+															return ((IJsGlobalScopeContainer) o)

 																	.getDescription();

 														}

 													})));

diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_out.js b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_out.js
index 5766d56..223f32d 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_out.js
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test185/A_out.js
@@ -22,7 +22,7 @@
 											new org.eclipse.wst.jsdt.internal.compiler.util.Util.Displayable() {

 												public String displayString(

 														Object o) {

-													return ((IClasspathContainer) o)

+													return ((IJsGlobalScopeContainer) o)

 															.getDescription();

 												}

 											})));

diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_in.js b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_in.js
index 18f9dd5..0c5e5f3 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_in.js
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_in.js
@@ -7,7 +7,7 @@
 		+ "} with values: " //$NON-NLS-1$

 		+ (org.eclipse.wst.jsdt.internal.compiler.util.Util.toString(respectiveContainers, 

 				new org.eclipse.wst.jsdt.internal.compiler.util.Util.Displayable(){ 

-					public String displayString(Object o) { return ((IClasspathContainer) o).getDescription(); }

+					public String displayString(Object o) { return ((IJsGlobalScopeContainer) o).getDescription(); }

 				}))

 			);

 }
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_out.js b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_out.js
index bc2d3e4..699149b 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_out.js
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/workspace/Formatter/test350/A_out.js
@@ -16,7 +16,7 @@
 									respectiveContainers,

 									new org.eclipse.wst.jsdt.internal.compiler.util.Util.Displayable() {

 										public String displayString(Object o) {

-											return ((IClasspathContainer) o)

+											return ((IJsGlobalScopeContainer) o)

 													.getDescription();

 										}

 									})));