diff --git a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowIdHandlerMapping.java b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerMapping.java
similarity index 98%
rename from spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowIdHandlerMapping.java
rename to spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerMapping.java
index 8a2d678c..93e6726c 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowIdHandlerMapping.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerMapping.java
@@ -37,7 +37,7 @@ import org.springframework.webflow.definition.registry.FlowDefinitionRegistry;
  * 
  * @author Keith Donald
  */
-public class FlowIdHandlerMapping extends AbstractHandlerMapping {
+public class FlowHandlerMapping extends AbstractHandlerMapping {
 
 	private FlowUrlHandler flowUrlHandler = new DefaultFlowUrlHandler();