diff --git a/spring-webflow-reference/src/spring-mvc.xml b/spring-webflow-reference/src/spring-mvc.xml
index cb97b26e..ad88e3ad 100644
--- a/spring-webflow-reference/src/spring-mvc.xml
+++ b/spring-webflow-reference/src/spring-mvc.xml
@@ -84,10 +84,10 @@ public interface FlowHandler {
 
     public MutableAttributeMap createExecutionInputMap(HttpServletRequest request);
 
-    public String handleExecutionOutcome(String outcome, AttributeMap output,
+    public String handleExecutionOutcome(FlowExecutionOutcome outcome,
         HttpServletRequest request, HttpServletResponse response);
 
-    public ModelAndView handleException(FlowException e,
+    public String handleException(FlowException e,
         HttpServletRequest request, HttpServletResponse response);
 }				
 		</programlisting>
@@ -132,12 +132,12 @@ public interface FlowHandler {
 			</para>
 			<programlisting language="java"><![CDATA[
 public class BookingFlowHandler extends AbstractFlowHandler {
-    public String handleExecutionOutcome(String outcome, AttributeMap output,
+    public String handleExecutionOutcome(FlowExecutionOutcome outcome,
                                          HttpServletRequest request, HttpServletResponse response) {
-        if (outcome.equals("bookingConfirmed")) {
-            return "booking/show?bookingId=" + output.get("bookingId");
+        if (outcome.getId().equals("bookingConfirmed")) {
+            return "/booking/show?bookingId=" + outcome.getOutput().get("bookingId");
         } else {
-            return "hotels/index";
+            return "/hotels/index";
         }
     }
 }]]>
@@ -233,7 +233,7 @@ public class BookingFlowHandler extends AbstractFlowHandler {
 
 <webflow:flow-builder-services id="flowBuilderServices" view-factory-creator="mvcViewFactoryCreator"/>
 
-<bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.view.MvcViewFactoryCreator">
+<bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">
     <property name="viewResolvers" ref="myExistingViewResolverToUseForFlows"/>
 </bean>]]>
 		</programlisting>
diff --git a/spring-webflow-reference/src/system-setup.xml b/spring-webflow-reference/src/system-setup.xml
index f877c016..cd44b40b 100644
--- a/spring-webflow-reference/src/system-setup.xml
+++ b/spring-webflow-reference/src/system-setup.xml
@@ -50,7 +50,7 @@
 				Deploy a FlowExecutor, the central service for executing flows:
 			</para>
 			<programlisting type="xml"><![CDATA[
-<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry" />]]>
+<webflow:flow-executor id="flowExecutor" />]]>
 			</programlisting>
 		</sect2>
 		<para>
@@ -209,8 +209,8 @@
 			<programlisting type="xml"><![CDATA[
 <flow-execution-repository max-executions="5" max-execution-snapshots="30" />]]>
 			</programlisting>
-			<sect3 id="repository-max-conversations">
-				<title>max-conversations</title>
+			<sect3 id="repository-max-executions">
+				<title>max-executions</title>
 				<para>
 					Tune the <code>max-executions</code> attribute to place a cap on the number of flow executions that can be created per user session.
 				</para>
diff --git a/spring-webflow-reference/src/upgrade-guide.xml b/spring-webflow-reference/src/upgrade-guide.xml
index 87905730..4c03bd1e 100644
--- a/spring-webflow-reference/src/upgrade-guide.xml
+++ b/spring-webflow-reference/src/upgrade-guide.xml
@@ -208,7 +208,7 @@ java org.springframework.webflow.upgrade.WebFlowUpgrader flow-to-upgrade.xml
 <webflow:flow-builder-services id="flowBuilderServices" 
                                view-factory-creator="mvcViewFactoryCreator"/>
 
-<bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.view.MvcViewFactoryCreator">
+<bean id="mvcViewFactoryCreator" class="org.springframework.webflow.mvc.builder.MvcViewFactoryCreator">
     <property name="viewResolvers" ref="tilesViewResolver"/>
 </bean>