diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml
index a3bc5518..16202ae5 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -20,9 +20,8 @@
 	</webflow:flow-executor>
 	
 	<!-- The registry of executable flow definitions -->
-	<webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices">
-		<webflow:flow-location path="/WEB-INF/flows/main/main.xml" />
-		<webflow:flow-location path="/WEB-INF/flows/booking/booking.xml" />
+	<webflow:flow-registry id="flowRegistry" flow-builder-services="facesFlowBuilderServices" base-path="/WEB-INF/flows">
+		<webflow:flow-location-pattern value="**/*-flow.xml" />
 	</webflow:flow-registry>
 	
 	<!-- Configures the Spring Web Flow JSF integration -->
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml
similarity index 100%
rename from spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking.xml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/booking-flow.xml
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main-flow.xml
similarity index 100%
rename from spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main-flow.xml
diff --git a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java b/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java
index b617b2c2..4276dae4 100644
--- a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java
+++ b/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java
@@ -20,7 +20,7 @@ public class BookingFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 
     @Override
     protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) {
-	return resourceFactory.createFileResource("src/main/webapp/WEB-INF/flows/booking/booking.xml");
+	return resourceFactory.createFileResource("src/main/webapp/WEB-INF/flows/booking/booking-flow.xml");
     }
 
     @Override
diff --git a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java b/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java
index 463e7f86..280ac097 100644
--- a/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java
+++ b/spring-webflow-samples/booking-faces/src/test/java/org/springframework/webflow/samples/booking/MainFlowExecutionTests.java
@@ -29,7 +29,7 @@ public class MainFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 
     @Override
     protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) {
-	return resourceFactory.createFileResource("src/main/webapp/WEB-INF/flows/main/main.xml");
+	return resourceFactory.createFileResource("src/main/webapp/WEB-INF/flows/main/main-flow.xml");
     }
 
     @Override
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
index e9b9d441..5fe16244 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webflow-config.xml
@@ -17,8 +17,8 @@
 	</webflow:flow-executor>
 	
 	<!-- The registry of executable flow definitions -->
-	<webflow:flow-registry id="flowRegistry" flow-builder-services="flowBuilderServices">
-		<webflow:flow-location id="hotels/booking" path="/WEB-INF/hotels/booking/booking.xml" />
+	<webflow:flow-registry id="flowRegistry" flow-builder-services="flowBuilderServices" base-path="/WEB-INF">
+		<webflow:flow-location-pattern value="**/*-flow.xml" />
 	</webflow:flow-registry>
 		
 	<!-- Plugs in a custom creator for Web Flow views -->
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking.xml
rename to spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml
diff --git a/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java b/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java
index 342c47fb..63d78e94 100644
--- a/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java
+++ b/spring-webflow-samples/booking-mvc/src/test/java/org/springframework/webflow/samples/booking/BookingFlowExecutionTests.java
@@ -19,7 +19,7 @@ public class BookingFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 
     @Override
     protected FlowDefinitionResource getResource(FlowDefinitionResourceFactory resourceFactory) {
-	return resourceFactory.createFileResource("src/main/webapp/WEB-INF/hotels/booking/booking.xml");
+	return resourceFactory.createFileResource("src/main/webapp/WEB-INF/hotels/booking/booking-flow.xml");
     }
 
     @Override