diff --git a/org.springframework.context/src/main/java/org/springframework/ui/lifecycle/WebBindAndValidateLifecycle.java b/org.springframework.context/src/main/java/org/springframework/ui/lifecycle/BindAndValidateLifecycle.java
similarity index 94%
rename from org.springframework.context/src/main/java/org/springframework/ui/lifecycle/WebBindAndValidateLifecycle.java
rename to org.springframework.context/src/main/java/org/springframework/ui/lifecycle/BindAndValidateLifecycle.java
index 2afb8dcf9e256a04234cdbb6d04318b0bb4791d7..d738303c3022b12711255ce4ab98df793cc828b0 100644
--- a/org.springframework.context/src/main/java/org/springframework/ui/lifecycle/WebBindAndValidateLifecycle.java
+++ b/org.springframework.context/src/main/java/org/springframework/ui/lifecycle/BindAndValidateLifecycle.java
@@ -28,7 +28,7 @@ import org.springframework.ui.validation.Validator;
  * @author Keith Donald
  * @since 3.0
  */
-public class WebBindAndValidateLifecycle {
+public class BindAndValidateLifecycle {
 
 	private final Binder binder;
 
@@ -38,7 +38,7 @@ public class WebBindAndValidateLifecycle {
 
 	private Validator validator;
 
-	public WebBindAndValidateLifecycle(Binder binder, AlertContext alertContext) {
+	public BindAndValidateLifecycle(Binder binder, AlertContext alertContext) {
 		this.binder = binder;
 		this.alertContext = alertContext;
 	}
diff --git a/org.springframework.context/src/test/java/org/springframework/ui/lifecycle/WebBindAndValidateLifecycleTests.java b/org.springframework.context/src/test/java/org/springframework/ui/lifecycle/BindAndValidateLifecycleTests.java
similarity index 93%
rename from org.springframework.context/src/test/java/org/springframework/ui/lifecycle/WebBindAndValidateLifecycleTests.java
rename to org.springframework.context/src/test/java/org/springframework/ui/lifecycle/BindAndValidateLifecycleTests.java
index 8ea5d2bae60e995904db5abfc8d916e7155c2a2a..1a770dcbd9eacc18b1ade87d506c290cf6dede4b 100644
--- a/org.springframework.context/src/test/java/org/springframework/ui/lifecycle/WebBindAndValidateLifecycleTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/ui/lifecycle/BindAndValidateLifecycleTests.java
@@ -12,14 +12,15 @@ import org.junit.Before;
 import org.junit.Test;
 import org.springframework.ui.alert.Severity;
 import org.springframework.ui.alert.support.DefaultAlertContext;
+import org.springframework.ui.binding.Binder;
 import org.springframework.ui.binding.Bound;
 import org.springframework.ui.binding.Model;
 import org.springframework.ui.binding.support.WebBinderFactory;
 import org.springframework.ui.format.number.CurrencyFormat;
 
-public class WebBindAndValidateLifecycleTests {
+public class BindAndValidateLifecycleTests {
 
-	private WebBindAndValidateLifecycle lifecycle;
+	private BindAndValidateLifecycle lifecycle;
 
 	private TestBean model;
 	
@@ -29,7 +30,8 @@ public class WebBindAndValidateLifecycleTests {
 	public void setUp() {
 		model = new TestBean();
 		alertContext = new DefaultAlertContext();
-		lifecycle = new WebBindAndValidateLifecycle(new WebBinderFactory().getBinder(model), alertContext);
+		Binder binder = new WebBinderFactory().getBinder(model);
+		lifecycle = new BindAndValidateLifecycle(binder, alertContext);
 	}
 
 	@Test