diff --git a/spring-webflow-samples/booking-jsf/.classpath b/spring-webflow-samples/booking-faces/.classpath
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.classpath
rename to spring-webflow-samples/booking-faces/.classpath
diff --git a/spring-webflow-samples/booking-jsf/.m7project b/spring-webflow-samples/booking-faces/.m7project
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.m7project
rename to spring-webflow-samples/booking-faces/.m7project
diff --git a/spring-webflow-samples/booking-jsf/.project b/spring-webflow-samples/booking-faces/.project
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.project
rename to spring-webflow-samples/booking-faces/.project
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.core.prefs b/spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.core.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.core.prefs
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.ui.prefs b/spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.jdt.ui.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.jdt.ui.prefs
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jpt.core.prefs b/spring-webflow-samples/booking-faces/.settings/org.eclipse.jpt.core.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.jpt.core.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.jpt.core.prefs
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs b/spring-webflow-samples/booking-faces/.settings/org.eclipse.jst.common.project.facet.core.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.jst.common.project.facet.core.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.jst.common.project.facet.core.prefs
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.common.component b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.common.component
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.component
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.common.project.facet.core.xml b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.common.project.facet.core.xml
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.validation.prefs b/spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.validation.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.eclipse.wst.validation.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.eclipse.wst.validation.prefs
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.hibernate.eclipse.console.prefs b/spring-webflow-samples/booking-faces/.settings/org.hibernate.eclipse.console.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.hibernate.eclipse.console.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.hibernate.eclipse.console.prefs
diff --git a/spring-webflow-samples/booking-jsf/.settings/org.springframework.ide.eclipse.core.prefs b/spring-webflow-samples/booking-faces/.settings/org.springframework.ide.eclipse.core.prefs
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.settings/org.springframework.ide.eclipse.core.prefs
rename to spring-webflow-samples/booking-faces/.settings/org.springframework.ide.eclipse.core.prefs
diff --git a/spring-webflow-samples/booking-jsf/.springBeans b/spring-webflow-samples/booking-faces/.springBeans
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.springBeans
rename to spring-webflow-samples/booking-faces/.springBeans
diff --git a/spring-webflow-samples/booking-jsf/.springWebflow b/spring-webflow-samples/booking-faces/.springWebflow
similarity index 100%
rename from spring-webflow-samples/booking-jsf/.springWebflow
rename to spring-webflow-samples/booking-faces/.springWebflow
diff --git a/spring-webflow-samples/booking-jsf/build.xml b/spring-webflow-samples/booking-faces/build.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/build.xml
rename to spring-webflow-samples/booking-faces/build.xml
diff --git a/spring-webflow-samples/booking-jsf/hibernate.cfg.xml b/spring-webflow-samples/booking-faces/hibernate.cfg.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/hibernate.cfg.xml
rename to spring-webflow-samples/booking-faces/hibernate.cfg.xml
diff --git a/spring-webflow-samples/booking-jsf/ivy.xml b/spring-webflow-samples/booking-faces/ivy.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/ivy.xml
rename to spring-webflow-samples/booking-faces/ivy.xml
diff --git a/spring-webflow-samples/booking-jsf/project.properties b/spring-webflow-samples/booking-faces/project.properties
similarity index 100%
rename from spring-webflow-samples/booking-jsf/project.properties
rename to spring-webflow-samples/booking-faces/project.properties
diff --git a/spring-webflow-samples/booking-jsf/src/etc/filter.properties b/spring-webflow-samples/booking-faces/src/etc/filter.properties
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/etc/filter.properties
rename to spring-webflow-samples/booking-faces/src/etc/filter.properties
diff --git a/spring-webflow-samples/booking-jsf/src/etc/test-resources/log4j.properties b/spring-webflow-samples/booking-faces/src/etc/test-resources/log4j.properties
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/etc/test-resources/log4j.properties
rename to spring-webflow-samples/booking-faces/src/etc/test-resources/log4j.properties
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Booking.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Booking.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Booking.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/BookingService.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Hotel.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/Hotel.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/JpaBookingService.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/SearchCriteria.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/User.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/User.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/User.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/User.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/web/FlowHelper.java b/spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/web/FlowHelper.java
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/java/org/springframework/webflow/samples/booking/web/FlowHelper.java
rename to spring-webflow-samples/booking-faces/src/main/java/org/springframework/webflow/samples/booking/web/FlowHelper.java
diff --git a/spring-webflow-samples/booking-jsf/src/main/resources/META-INF/persistence.xml b/spring-webflow-samples/booking-faces/src/main/resources/META-INF/persistence.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/resources/META-INF/persistence.xml
rename to spring-webflow-samples/booking-faces/src/main/resources/META-INF/persistence.xml
diff --git a/spring-webflow-samples/booking-jsf/src/main/resources/import.sql b/spring-webflow-samples/booking-faces/src/main/resources/import.sql
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/resources/import.sql
rename to spring-webflow-samples/booking-faces/src/main/resources/import.sql
diff --git a/spring-webflow-samples/booking-jsf/src/main/resources/log4j.xml b/spring-webflow-samples/booking-faces/src/main/resources/log4j.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/resources/log4j.xml
rename to spring-webflow-samples/booking-faces/src/main/resources/log4j.xml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/META-INF/MANIFEST.MF b/spring-webflow-samples/booking-faces/src/main/webapp/META-INF/MANIFEST.MF
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/META-INF/MANIFEST.MF
rename to spring-webflow-samples/booking-faces/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/classes/log4j.properties b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/classes/log4j.properties
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/classes/log4j.properties
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/booking-flow.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-jsf/src/main/webapp/WEB-INF/flows/booking/booking-flow.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-jsf/src/main/webapp/WEB-INF/flows/booking/bookingForm.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/bookingForm.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/bookingForm.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/bookingForm.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/booking/confirmBooking.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/displayHotels.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/hotelDetails.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main-flow.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-jsf/src/main/webapp/WEB-INF/flows/main/main-flow.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-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/flows/main/main.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/flows/main/main.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/intro.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/intro.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/intro.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/layouts/standard.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/layouts/standard.xhtml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web-application-config.xml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/web.xml
rename to spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web.xml
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/bg.gif
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/bg.gif
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/btn.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/btn.bg.gif
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/btn.bg.gif
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/diplomat.jpg b/spring-webflow-samples/booking-faces/src/main/webapp/images/diplomat.jpg
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/diplomat.jpg
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/diplomat.jpg
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/header.jpg b/spring-webflow-samples/booking-faces/src/main/webapp/images/header.jpg
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/header.jpg
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/header.jpg
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/input.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/input.bg.gif
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/input.bg.gif
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/powered-by-spring.png b/spring-webflow-samples/booking-faces/src/main/webapp/images/powered-by-spring.png
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/powered-by-spring.png
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/powered-by-spring.png
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/th.bg.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/th.bg.gif
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/th.bg.gif
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/images/tse.gif b/spring-webflow-samples/booking-faces/src/main/webapp/images/tse.gif
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/images/tse.gif
rename to spring-webflow-samples/booking-faces/src/main/webapp/images/tse.gif
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/index.html b/spring-webflow-samples/booking-faces/src/main/webapp/index.html
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/index.html
rename to spring-webflow-samples/booking-faces/src/main/webapp/index.html
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/styles/booking.css b/spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css
similarity index 100%
rename from spring-webflow-samples/booking-jsf/src/main/webapp/styles/booking.css
rename to spring-webflow-samples/booking-faces/src/main/webapp/styles/booking.css
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml
index caa231ac..b9666992 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/config/application-layer-config.xml
@@ -9,7 +9,7 @@
http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
-
+