diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java
index 8343c741104..fe4bb1e73aa 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/ToolChainModificationHelper.java
@@ -23,14 +23,14 @@ import java.util.Set;
 import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
 import org.eclipse.cdt.managedbuilder.core.ITool;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
-import org.eclipse.cdt.managedbuilder.internal.tcmodification.ListMap;
-import org.eclipse.cdt.managedbuilder.internal.tcmodification.ListMap.CollectionEntry;
+import org.eclipse.cdt.managedbuilder.internal.tcmodification.ToolListMap;
+import org.eclipse.cdt.managedbuilder.internal.tcmodification.ToolListMap.CollectionEntry;
 import org.eclipse.core.runtime.IConfigurationElement;
 
 public class ToolChainModificationHelper {
 	
-	private static ListMap createRealToToolMap(ITool[] tools, boolean ext){
-		ListMap lMap = new ListMap();
+	private static ToolListMap createRealToToolMap(ITool[] tools, boolean ext){
+		ToolListMap lMap = new ToolListMap();
 		for(int i = 0; i < tools.length; i++){
 			ITool tool = tools[i];
 			ITool rt = ManagedBuildManager.getRealTool(tool);
@@ -45,8 +45,8 @@ public class ToolChainModificationHelper {
 		return lMap;
 	}
 	
-	private static ListMap calculateDifference(ListMap m1, ListMap m2){
-		m1 = (ListMap)m1.clone();
+	private static ToolListMap calculateDifference(ToolListMap m1, ToolListMap m2){
+		m1 = (ToolListMap)m1.clone();
 		Set ceSet2 = m2.collectionEntrySet();
 		
 		for(Iterator iter = ceSet2.iterator(); iter.hasNext(); ){
@@ -66,7 +66,7 @@ public class ToolChainModificationHelper {
 	}
 
 	static public ToolListModificationInfo getModificationInfo(IResourceInfo rcInfo, ITool[] fromTools, ITool[] addedTools, ITool[] removedTools){
-		ListMap addedMap = createRealToToolMap(addedTools, false);
+		ToolListMap addedMap = createRealToToolMap(addedTools, false);
 		for(int i = 0; i < removedTools.length; i++){
 			ITool removedTool = removedTools[i];
 			ITool realTool = ManagedBuildManager.getRealTool(removedTool);
@@ -76,7 +76,7 @@ public class ToolChainModificationHelper {
 			addedMap.remove(realTool, 0);
 		}
 		
-		ListMap removedMap = createRealToToolMap(removedTools, false);
+		ToolListMap removedMap = createRealToToolMap(removedTools, false);
 		for(int i = 0; i < addedTools.length; i++){
 			ITool addedTool = addedTools[i];
 			ITool realTool = ManagedBuildManager.getRealTool(addedTool);
@@ -89,7 +89,7 @@ public class ToolChainModificationHelper {
 		addedMap.clearEmptyLists();
 		removedMap.clearEmptyLists();
 		
-		ListMap curMap = createRealToToolMap(fromTools, false);
+		ToolListMap curMap = createRealToToolMap(fromTools, false);
 		for(Iterator iter = removedMap.collectionEntrySet().iterator(); iter.hasNext();){
 			CollectionEntry entry = (CollectionEntry)iter.next();
 			List cur = curMap.get(entry.getKey(), false);
@@ -133,7 +133,7 @@ public class ToolChainModificationHelper {
 
 	static public ToolListModificationInfo getModificationInfo(IResourceInfo rcInfo, ITool[] fromTools, ITool[] toTools){
 		
-		ListMap curMap = createRealToToolMap(fromTools, false);
+		ToolListMap curMap = createRealToToolMap(fromTools, false);
 		List resultingList = new ArrayList();
 		List addedList = new ArrayList(7);
 		List remainedList = new ArrayList(7);
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListMap.java
similarity index 97%
rename from build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java
rename to build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListMap.java
index f5b5efa29b0..c2523710bec 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ListMap.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/tcmodification/ToolListMap.java
@@ -22,11 +22,11 @@ import java.util.Set;
 
 import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
 
-public class ListMap implements Cloneable {
+public class ToolListMap implements Cloneable {
 	private HashMap fMap;
 	private CollectionEntrySet fCollectionEntrySet;
 
-	public ListMap(){
+	public ToolListMap(){
 		fMap = new HashMap();
 	}
 	
@@ -248,7 +248,7 @@ public class ListMap implements Cloneable {
 		return fCollectionEntrySet;
 	}
 
-	public void difference(ListMap map){
+	public void difference(ToolListMap map){
 		for(Iterator iter = map.fMap.entrySet().iterator(); iter.hasNext(); ){
 			Map.Entry entry = (Map.Entry)iter.next();
 			Collection thisC = (Collection)fMap.get(entry.getKey());
@@ -271,7 +271,7 @@ public class ListMap implements Cloneable {
 	@Override
 	public Object clone() {
 		try {
-			ListMap clone = (ListMap)super.clone();
+			ToolListMap clone = (ToolListMap)super.clone();
 			clone.fMap = (HashMap)fMap.clone();
 			for(Iterator iter = clone.fMap.entrySet().iterator(); iter.hasNext();){
 				Map.Entry entry = (Map.Entry)iter.next();