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.xml
index 343c21b5..98ce1b69 100755
--- 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.xml
@@ -10,14 +10,14 @@
 	</input-mapper>
 
 	<start-actions>
-		<evaluate-action expression="#{bookingService.findHotelById(id)}" result="#{flowScope.hotel}" />
-		<evaluate-action expression="hotel.createBooking(currentUser)" result="#{flowScope.booking}"/>
-		<evaluate-action expression="entityManager.persist(booking)"/>
+		<evaluate expression="#{bookingService.findHotelById(id)}" result="#{flowScope.hotel}" />
+		<evaluate expression="#{hotel.createBooking(currentUser)}" result="#{flowScope.booking}" />
+		<evaluate expression="#{entityManager.persist(booking)}" />
 	</start-actions>
 	
 	<view-state id="enterBookingDetails">
 		<transition on="proceed" to="reviewBooking">
-			<evaluate-action expression="booking.validate(messageContext)" />
+			<evaluate expression="booking.validate(messageContext)" />
 		</transition>
 		<transition on="cancel" to="bookingCancelled" />
 	</view-state>
@@ -28,7 +28,7 @@
 		<transition on="cancel" to="bookingCancelled" />
 	</view-state>
 	
-	<end-state id="bookingConfirmed" commit="true"/>
+	<end-state id="bookingConfirmed" commit="true" />
 
 	<end-state id="bookingCancelled" />
 		
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.xml
index 91ac6419..0bc08898 100755
--- 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.xml
@@ -7,24 +7,24 @@
 	
 	<view-state id="enterSearchCriteria">
 		<render-actions>
-			<evaluate-action expression="#{bookingService.findBookings(currentUser)}" result="#{flowScope.bookings}" result-type="dataModel" />
+			<evaluate expression="#{bookingService.findBookings(currentUser)}" result="#{flowScope.bookings}" result-type="dataModel" />
 		</render-actions>
 		<transition on="search" to="reviewHotels" />
 		<transition on="cancelBooking">
-			<evaluate-action expression="#{bookingService.cancelBooking(bookings.selectedRow)}" />
+			<evaluate expression="#{bookingService.cancelBooking(bookings.selectedRow)}" />
 		</transition>
 	</view-state>
 	
 	<view-state id="reviewHotels">
 		<render-actions>
-			<evaluate-action expression="#{bookingService.searchHotels(searchCriteria)}" result="#{flowScope.hotels}" result-type="dataModel" />
+			<evaluate expression="#{bookingService.searchHotels(searchCriteria)}" result="#{flowScope.hotels}" result-type="dataModel" />
 		</render-actions>
 		<transition on="previous">
-			<evaluate-action expression="#{searchCriteria.previousPage()}" />
+			<evaluate expression="#{searchCriteria.previousPage()}" />
 			<render fragments="searchResultsFragment" />
 		</transition>
 		<transition on="next">
-			<evaluate-action expression="#{searchCriteria.nextPage()}" />
+			<evaluate expression="#{searchCriteria.nextPage()}" />
 			<render fragments="searchResultsFragment" />
 		</transition>
 		<transition on="select" to="reviewHotel" />
@@ -33,18 +33,16 @@
 	
 	<view-state id="reviewHotel">
 		<render-actions>
-			<set attribute="#{requestScope.hotel}" value="#{hotels.selectedRow}" />
+			<set name="#{requestScope.hotel}" value="#{hotels.selectedRow}" />
 		</render-actions>
 		<transition on="book" to="bookHotel" />
 		<transition on="cancel" to="enterSearchCriteria" />
 	</view-state>
 
-	<subflow-state id="bookHotel" flow="booking">
-		<attribute-mapper>
-			<input-mapper>
-				<mapping source="#{hotels.selectedRow.id}" target="#{id}" />
-			</input-mapper>
-		</attribute-mapper>
+	<subflow-state id="bookHotel" subflow="booking">
+		<input-mapper>
+			<mapping source="#{hotels.selectedRow.id}" target="#{id}" />
+		</input-mapper>
 		<transition on="bookingConfirmed" to="finish" />
 		<transition on="bookingCancelled" to="enterSearchCriteria" />
 	</subflow-state>