diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java
index fecf2cd12a3..697825ee015 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDISession.java
@@ -59,7 +59,7 @@ public interface ICDISession
 	 * 
 	 * @return the expression manager
 	 */
-	ICDIVariableManager getExpressionManager();
+	ICDIVariableManager getVariableManager();
 
 	/**
 	 * Returns the memory manager of this debug session.
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java
index abac831f1eb..d33cb43ecbe 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CSession.java
@@ -12,7 +12,7 @@ import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDIBreakpointManager;
 import org.eclipse.cdt.debug.core.cdi.ICDIDebugConfiguration;
 import org.eclipse.cdt.debug.core.cdi.ICDIEventManager;
-import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager;
+import org.eclipse.cdt.debug.core.cdi.ICDIVariableManager;
 import org.eclipse.cdt.debug.core.cdi.ICDIMemoryManager;
 import org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
@@ -31,7 +31,7 @@ public class CSession implements ICDISession, ICDISessionObject {
 	MISession session;
 	BreakpointManager breakpointManager;
 	EventManager eventManager;
-	ExpressionManager expressionManager;
+	VariableManager expressionManager;
 	MemoryManager memoryManager;
 	SignalManager signalManager;
 	SourceManager sourceManager;
@@ -43,7 +43,7 @@ public class CSession implements ICDISession, ICDISessionObject {
 		breakpointManager = new BreakpointManager(this);
 		eventManager = new EventManager(this);
 		s.addObserver(eventManager);
-		expressionManager = new ExpressionManager(this);
+		expressionManager = new VariableManager(this);
 		memoryManager = new MemoryManager(this);
 		signalManager = new SignalManager(this);
 		sourceManager = new SourceManager(this);
@@ -84,9 +84,9 @@ public class CSession implements ICDISession, ICDISessionObject {
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getExpressionManager()
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDISession#getVariableManager()
 	 */
-	public ICDIExpressionManager getExpressionManager() {
+	public ICDIVariableManager getVariableManager() {
 		return expressionManager;
 	}
 
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
index 80bc6dee702..eb514ba5243 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/CTarget.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
-import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager;
+import org.eclipse.cdt.debug.core.cdi.ICDIVariableManager;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIGlobalVariable;
@@ -393,7 +393,7 @@ public class CTarget  implements ICDITarget {
 	 */
 	public ICDIValue evaluateExpressionToValue(String expressionText)
 		throws CDIException {
-		ICDIExpressionManager mgr = session.getExpressionManager();
+		ICDIVariableManager mgr = session.getVariableManager();
 		ICDIExpression cexp = mgr.createExpression(expressionText);
 		ICDIValue value = cexp.getValue();
 		mgr.removeExpression(cexp);
diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
similarity index 80%
rename from debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java
rename to debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
index 55adfbd678c..5a2afca2496 100644
--- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/ExpressionManager.java
+++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/VariableManager.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 import org.eclipse.cdt.debug.core.cdi.CDIException;
 import org.eclipse.cdt.debug.core.cdi.ICDICondition;
-import org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager;
+import org.eclipse.cdt.debug.core.cdi.ICDIVariableManager;
 import org.eclipse.cdt.debug.core.cdi.model.ICDIExpression;
 import org.eclipse.cdt.debug.mi.core.MIException;
 import org.eclipse.cdt.debug.mi.core.MISession;
@@ -28,18 +28,18 @@ import org.eclipse.cdt.debug.mi.core.output.MIVarCreateInfo;
  * To enable and disable the creation of type comments go to
  * Window>Preferences>Java>Code Generation.
  */
-public class ExpressionManager
+public class VariableManager
 	extends SessionObject
-	implements ICDIExpressionManager {
+	implements ICDIVariableManager {
 
 	List expList;
-	public ExpressionManager(CSession session) {
+	public VariableManager(CSession session) {
 		super(session);
 		expList = new ArrayList();
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#getExpression(String)
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getExpression(String)
 	 */
 	public ICDIExpression getExpression(String expressionId)
 		throws CDIException {
@@ -53,14 +53,14 @@ public class ExpressionManager
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#getExpressions()
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#getExpressions()
 	 */
 	public ICDIExpression[] getExpressions() throws CDIException {
 		return (ICDIExpression[]) expList.toArray(new ICDIExpression[0]);
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#removeExpression(ICDIExpression)
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#removeExpression(ICDIExpression)
 	 */
 	public void removeExpression(ICDIExpression expression)
 		throws CDIException {
@@ -80,7 +80,7 @@ public class ExpressionManager
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#removeExpressions(ICDIExpression[])
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#removeExpressions(ICDIExpression[])
 	 */
 	public void removeExpressions(ICDIExpression[] expressions)
 		throws CDIException {
@@ -90,7 +90,7 @@ public class ExpressionManager
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#createExpression(String)
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#createExpression(String)
 	 */
 	public ICDIExpression createExpression(String expressionId)
 		throws CDIException {
@@ -113,7 +113,7 @@ public class ExpressionManager
 	}
 
 	/**
-	 * @see org.eclipse.cdt.debug.core.cdi.ICDIExpressionManager#createCondition(int, String)
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDIVariableManager#createCondition(int, String)
 	 */
 	public ICDICondition createCondition(int ignoreCount, String expression) {
 		return new Condition(ignoreCount, expression);