diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java
index 6952840d..745c2c66 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/DefaultELContextFactory.java
@@ -16,7 +16,7 @@ public class DefaultELContextFactory implements ELContextFactory {
      * Configures and returns a simple EL context to use to parse EL expressions.
      * @return The configured simple ELContext instance.
      */
-    public ELContext getParseTimeELContext() {
+    public ELContext getParseContext() {
 	return new SimpleELContext();
     }
 
@@ -24,7 +24,7 @@ public class DefaultELContextFactory implements ELContextFactory {
      * Configures and returns a simple EL context to use to evaluate EL expressions on the given base target object.
      * @return The configured simple ELContext instance.
      */
-    public ELContext getEvalTimeELContext(Object target) {
+    public ELContext getEvaluationContext(Object target) {
 	return new SimpleELContext(target);
     }
 
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java
index 66f3b244..3a731621 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELContextFactory.java
@@ -14,7 +14,7 @@ public interface ELContextFactory {
      * Configures and returns an {@link ELContext} to be used in parsing EL expressions.
      * @return ELContext The configured ELContext instance for parsing expressions.
      */
-    public ELContext getParseTimeELContext();
+    public ELContext getParseContext();
 
     /**
      * Configures and returns an {@link ELContext} to be used in evaluating EL expressions on the given base target
@@ -23,6 +23,6 @@ public interface ELContextFactory {
      * @param target The base object for the expression evaluation.
      * @return ELContext The configured ELContext instance for evaluating expressions.
      */
-    public ELContext getEvalTimeELContext(Object target);
+    public ELContext getEvaluationContext(Object target);
 
 }
\ No newline at end of file
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
index b2524399..e24555d6 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpression.java
@@ -59,7 +59,7 @@ public class ELExpression implements SettableExpression {
      * @return {@link ELContext} The thread-bound {@link ELContext} instance.
      */
     protected ELContext getELContext(Object target) {
-	ELContext ctx = factory.getEvalTimeELContext(target);
+	ELContext ctx = factory.getEvaluationContext(target);
 	return ctx;
     }
 
diff --git a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java
index 62296fd5..b267e163 100644
--- a/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java
+++ b/spring-binding/src/main/java/org/springframework/binding/expression/el/ELExpressionParser.java
@@ -113,7 +113,7 @@ public class ELExpressionParser implements ExpressionParser {
      * @throws ParserException
      */
     protected SettableExpression doParseSettableExpression(String expressionString) throws ParserException {
-	ELContext ctx = contextFactory.getParseTimeELContext();
+	ELContext ctx = contextFactory.getParseContext();
 	try {
 	    return new ELExpression(contextFactory, expressionFactory.createValueExpression(ctx, expressionString,
 		    Object.class));
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
index 103c0c72..108a3267 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf11ELExpressionParser.java
@@ -28,7 +28,7 @@ public class Jsf11ELExpressionParser extends ELExpressionParser {
 
     private static class Jsf11ELContextFactory extends DefaultELContextFactory {
 
-	public ELContext getEvalTimeELContext(Object target) {
+	public ELContext getEvaluationContext(Object target) {
 
 	    FacesContext context = FacesContext.getCurrentInstance();
 	    return new Jsf11ELContext(context);
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
index b27e0b45..c8cc280e 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/Jsf12ELExpressionParser.java
@@ -25,7 +25,7 @@ public class Jsf12ELExpressionParser extends ELExpressionParser {
 
     private static class Jsf12ELContextFactory extends DefaultELContextFactory {
 
-	public ELContext getEvalTimeELContext(Object target) {
+	public ELContext getEvaluationContext(Object target) {
 	    FacesContext context = FacesContext.getCurrentInstance();
 	    return context.getELContext();
 	}