diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/enable-flow-scopes.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/enable-flow-scopes.xml
index 5cd29890..a3b9d4e4 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/enable-flow-scopes.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/enable-flow-scopes.xml
@@ -2,7 +2,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:aop="http://www.springframework.org/schema/aop" 
-       xmlns:web="http://www.springframework.org/schema/webflow-config"
+       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
@@ -11,25 +11,25 @@
            http://www.springframework.org/schema/webflow-config
            http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
 
-	<web:enable-flow-scopes/>
+	<webflow:enable-flow-scopes/>
 	
-	<web:flow-executor id="flowExecutor" flow-registry="flowRegistry">
-		<web:flow-execution-repository type="continuation" max-conversations="1" max-continuations="2"/>
-		<web:flow-execution-attributes>
-			<web:alwaysRedirectOnPause value="false"/>
-			<web:attribute name="foo" value="bar"/>		
-			<web:attribute name="bar" value="2" type="integer"/>		
-		</web:flow-execution-attributes>
-		<web:flow-execution-listeners>
-			<web:listener ref="listener" criteria="*"/>
-		</web:flow-execution-listeners>
-	</web:flow-executor>
+	<webflow:flow-executor id="flowExecutor" flow-registry="flowRegistry">
+		<webflow:flow-execution-repository type="continuation" max-conversations="1" max-continuations="2"/>
+		<webflow:flow-execution-attributes>
+			<webflow:alwaysRedirectOnPause value="false"/>
+			<webflow:attribute name="foo" value="bar"/>		
+			<webflow:attribute name="bar" value="2" type="integer"/>		
+		</webflow:flow-execution-attributes>
+		<webflow:flow-execution-listeners>
+			<webflow:listener ref="listener" criteria="*"/>
+		</webflow:flow-execution-listeners>
+	</webflow:flow-executor>
 	
 	<bean id="listener" class="org.springframework.webflow.config.EnableScopesBeanDefinitionParserTests$ConfigurationListener" />
 	
-	<web:flow-registry id="flowRegistry">
-		<web:flow-location path="org/springframework/webflow/config/enable-flow-scopes-flowdef.xml" />
-	</web:flow-registry>
+	<webflow:flow-registry id="flowRegistry">
+		<webflow:flow-location path="org/springframework/webflow/config/enable-flow-scopes-flowdef.xml" />
+	</webflow:flow-registry>
 
 	<bean id="user" class="org.springframework.webflow.config.EnableScopesUser" scope="flow">
 		<aop:scoped-proxy/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
index 66862553..eaff930a 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-builder-services.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:web="http://www.springframework.org/schema/webflow-config"
+       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/webflow-config
            http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
 	
-	<web:flow-builder-services id="flowBuilderServicesDefault"/>
+	<webflow:flow-builder-services id="flowBuilderServicesDefault"/>
 	
-	<web:flow-builder-services id="flowBuilderServicesCustom" 
+	<webflow:flow-builder-services id="flowBuilderServicesCustom" 
 		expression-parser="customExpressionParser"
 		view-factory-creator="customViewFactoryCreator"
 		conversion-service="customConversionService"/>
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
index 92f5d8b7..921b25ed 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
+++ b/spring-webflow/src/test/java/org/springframework/webflow/config/flow-registry.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:web="http://www.springframework.org/schema/webflow-config"
+       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
            http://www.springframework.org/schema/webflow-config
            http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd">
 
-	<web:flow-registry id="flowRegistry">
-		<web:flow-location id="flow" path="org/springframework/webflow/config/flow.xml">
-			<web:flow-definition-attributes>
-				<web:attribute name="foo" value="bar" />
-				<web:attribute name="bar" value="2" type="integer" />
-			</web:flow-definition-attributes>
-		</web:flow-location>
-		<web:flow-location path="/some/path/that/is/bogus.xml" />
-		<web:flow-builder class="org.springframework.webflow.config.FooFlowBuilder" />
-		<web:flow-builder id="foo2" class="org.springframework.webflow.config.FooFlowBuilder" />
-		<web:flow-builder id="foo3" class="org.springframework.webflow.config.FooFlowBuilder">
-			<web:flow-definition-attributes>
-				<web:attribute name="foo" value="bar" />
-				<web:attribute name="bar" value="2" type="integer" />
-			</web:flow-definition-attributes>
-		</web:flow-builder>
-	</web:flow-registry>
+	<webflow:flow-registry id="flowRegistry">
+		<webflow:flow-location id="flow" path="org/springframework/webflow/config/flow.xml">
+			<webflow:flow-definition-attributes>
+				<webflow:attribute name="foo" value="bar" />
+				<webflow:attribute name="bar" value="2" type="integer" />
+			</webflow:flow-definition-attributes>
+		</webflow:flow-location>
+		<webflow:flow-location path="/some/path/that/is/bogus.xml" />
+		<webflow:flow-builder class="org.springframework.webflow.config.FooFlowBuilder" />
+		<webflow:flow-builder id="foo2" class="org.springframework.webflow.config.FooFlowBuilder" />
+		<webflow:flow-builder id="foo3" class="org.springframework.webflow.config.FooFlowBuilder">
+			<webflow:flow-definition-attributes>
+				<webflow:attribute name="foo" value="bar" />
+				<webflow:attribute name="bar" value="2" type="integer" />
+			</webflow:flow-definition-attributes>
+		</webflow:flow-builder>
+	</webflow:flow-registry>
 	
 </beans>
\ No newline at end of file