diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
index 47155308..88f2facc 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/views.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE tiles-definitions PUBLIC
 	"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
 	"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+	
 <tiles-definitions>
 	
-	<!-- Pages -->
-	<definition name="enterBookingDetails.jsp" extends="standard-layout">
+	<definition name="enterBookingDetails" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/hotels/booking/enterBookingDetails.jsp" />
 	</definition>
 	
-	<definition name="reviewBooking.jsp" extends="standard-layout">
+	<definition name="reviewBooking" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/hotels/booking/reviewBooking.jsp" />
 	</definition>
 	
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index 91d0ffa5..78142c4f 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE tiles-definitions PUBLIC
 	"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
 	"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+	
 <tiles-definitions>
 	
-	<!-- Pages -->
-	<definition name="hotels/index" extends="standard-layout">
+	<definition name="hotels/index" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/hotels/index.jsp" />
 	</definition>
 	
-	<definition name="hotels/search" extends="standard-layout">
+	<definition name="hotels/search" extends="standardLayout">
 		<put-attribute name="body" value="search.body" />
 	</definition>
 	
@@ -17,7 +17,7 @@
         <put-attribute name="hotelResults" value="/WEB-INF/hotels/hotelResults.jsp" />
     </definition>
 	
-	<definition name="hotels/show" extends="standard-layout">
+	<definition name="hotels/show" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/hotels/show.jsp" />
 	</definition>
 	
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
index 47f45b1f..8868fe9b 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/intro.jsp
@@ -21,6 +21,6 @@
 		<li>Spring IDE tooling integration, with support for graphical flow modeling and visualization</li>
 	</ul>
 	<p align="right">
-		<a href="main">Start your Spring Travel experience</a>
+		<a href="hotels/index">Start your Spring Travel experience</a>
 	</p>
 </div>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/layouts.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/layouts.xml
index 6df28422..0f94b929 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/layouts.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/layouts/layouts.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE tiles-definitions PUBLIC
        "-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
        "http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+
 <tiles-definitions>
 	
-	<!-- Layout -->
-	<definition name="standard-layout" template="/WEB-INF/layouts/standard.jsp" />
+	<definition name="standardLayout" template="/WEB-INF/layouts/standard.jsp" />
 	
 </tiles-definitions>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
similarity index 100%
rename from spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logout-success.jsp
rename to spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/logoutSuccess.jsp
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml
index 9fcd9463..be48bc1f 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/views.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE tiles-definitions PUBLIC
 	"-//Apache Software Foundation//DTD Tiles Configuration 2.0//EN"
 	"http://tiles.apache.org/dtds/tiles-config_2_0.dtd">
+	
 <tiles-definitions>
 	
-	<!-- Pages -->
-	<definition name="intro" extends="standard-layout">
+	<definition name="intro" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/intro.jsp" />
 	</definition>
 	
-	<definition name="login" extends="standard-layout">
+	<definition name="login" extends="standardLayout">
 		<put-attribute name="body" value="/WEB-INF/login.jsp" />
 	</definition>
 	
-	<definition name="logout-success" extends="standard-layout">
-		<put-attribute name="body" value="/WEB-INF/logout-success.jsp" />
+	<definition name="logout-success" extends="standardLayout">
+		<put-attribute name="body" value="/WEB-INF/logoutSuccess.jsp" />
 	</definition>
 	
 </tiles-definitions>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/index.html b/spring-webflow-samples/booking-mvc/src/main/webapp/index.html
index e022195d..fce35507 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/index.html
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/index.html
@@ -1,5 +1,5 @@
 <html>
 <head>
-  <meta http-equiv="Refresh" content="0; URL=spring/hotels/index">
+  <meta http-equiv="Refresh" content="0; URL=spring/intro">
 </head>
 </html>
\ No newline at end of file