diff --git a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
index cbbbabaf..cc2d7884 100755
--- a/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
+++ b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,8 @@
 <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
 <wb-resource deploy-path="/WEB-INF/lib" source-path="/target/war-expanded/WEB-INF/lib"/>
 <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
 <property name="java-output-path" value="target/classes"/>
 <property name="context-root" value="/swf-booking-faces"/>
 </wb-module>
diff --git a/spring-webflow-samples/booking-faces/pom.xml b/spring-webflow-samples/booking-faces/pom.xml
index ce0f7ac7..533788a1 100644
--- a/spring-webflow-samples/booking-faces/pom.xml
+++ b/spring-webflow-samples/booking-faces/pom.xml
@@ -3,11 +3,10 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.webflow.samples</groupId>
-	<artifactId>booking-faces</artifactId>
+	<artifactId>swf-booking-faces</artifactId>
 	<packaging>war</packaging>
 	<version>2.0.4.RELEASE</version>
 	<dependencies>
-	 	<!-- global dependencies -->
 		<dependency>
 			<groupId>com.sun.facelets</groupId>
 			<artifactId>com.springsource.com.sun.facelets</artifactId>
@@ -169,20 +168,17 @@
 	<repositories>
 		<repository>
 			<id>com.springsource.repository.bundles.release</id>
-			<name> SpringSource Enterprise Bundle Repository - SpringSource
-				Releases </name>
-			<url> http://repository.springsource.com/maven/bundles/release </url>
+			<name>SpringSource Enterprise Bundle Repository - SpringSource Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/release</url>
 		</repository>
 		<repository>
 			<id>com.springsource.repository.bundles.external</id>
-			<name> SpringSource Enterprise Bundle Repository - External Releases 
-			</name>
-			<url> http://repository.springsource.com/maven/bundles/external 
-			</url>
+			<name>SpringSource Enterprise Bundle Repository - External Releases</name>
+			<url>http://repository.springsource.com/maven/bundles/external</url>
 		</repository>
 	</repositories>
 	<build>
-		<finalName>booking-faces</finalName>
+		<finalName>swf-booking-faces</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 7f5ac4c5..335ae9bb 100644
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -6,7 +6,7 @@
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking" -->
-	<bean class="org.springframework.webflow.mvc.servlet.FlowIdHandlerMapping">
+	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
 		<property name="defaultHandler">
 			<!-- If no flow match, map path to a view to render; e.g. the "/intro" path would map to the view named "intro" -->	
 			<bean class="org.springframework.web.servlet.mvc.UrlFilenameViewController" />
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
index 6fa6b1e9..d30c9143 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/webmvc-config.xml
@@ -6,7 +6,7 @@
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
 	<!-- Maps request paths to flows in the flowRegistry; e.g. a path of /hotels/booking looks for a flow with id "hotels/booking" -->
-	<bean class="org.springframework.webflow.mvc.servlet.FlowIdHandlerMapping">
+	<bean class="org.springframework.webflow.mvc.servlet.FlowHandlerMapping">
 		<property name="order" value="0" />
 	</bean>