diff --git a/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd b/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-2.0.xsd
similarity index 94%
rename from spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd
rename to spring-faces/src/main/java/org/springframework/faces/config/spring-faces-2.0.xsd
index 50f50fad..be8815bf 100644
--- a/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-config-2.0.xsd
+++ b/spring-faces/src/main/java/org/springframework/faces/config/spring-faces-2.0.xsd
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <xsd:schema
-	xmlns="http://www.springframework.org/schema/faces-config"
+	xmlns="http://www.springframework.org/schema/faces"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	targetNamespace="http://www.springframework.org/schema/faces-config"
+	targetNamespace="http://www.springframework.org/schema/faces"
 	elementFormDefault="qualified" attributeFormDefault="unqualified"
 	version="2.0">
 	
diff --git a/spring-faces/src/main/resources/META-INF/spring.handlers b/spring-faces/src/main/resources/META-INF/spring.handlers
index d533e40a..be6d3eb7 100644
--- a/spring-faces/src/main/resources/META-INF/spring.handlers
+++ b/spring-faces/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/faces-config=org.springframework.faces.config.FacesConfigNamespaceHandler
\ No newline at end of file
+http\://www.springframework.org/schema/faces=org.springframework.faces.config.FacesConfigNamespaceHandler
\ No newline at end of file
diff --git a/spring-faces/src/main/resources/META-INF/spring.schemas b/spring-faces/src/main/resources/META-INF/spring.schemas
index 7188d258..b8044e12 100644
--- a/spring-faces/src/main/resources/META-INF/spring.schemas
+++ b/spring-faces/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/schema/faces-config/spring-faces-config-2.0.xsd=org/springframework/faces/config/spring-faces-config-2.0.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/faces/spring-faces-2.0.xsd=org/springframework/faces/config/spring-faces-2.0.xsd
\ No newline at end of file
diff --git a/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml b/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml
index 1876bb3d..41c7c634 100644
--- a/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml
+++ b/spring-faces/src/test/java/org/springframework/faces/config/flow-builder-services.xml
@@ -1,12 +1,12 @@
 <?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:faces="http://www.springframework.org/schema/faces-config"
+       xmlns:faces="http://www.springframework.org/schema/faces"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-           http://www.springframework.org/schema/faces-config
-           http://www.springframework.org/schema/faces-config/spring-faces-config-2.0.xsd">
+           http://www.springframework.org/schema/faces
+           http://www.springframework.org/schema/faces/spring-faces-2.0.xsd">
 	
 	<faces:flow-builder-services id="flowBuilderServicesDefault"/>
 	
diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
index 31c7025b..567fb040 100755
--- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
+++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/web-application-config.xml
@@ -4,7 +4,7 @@
        xmlns:context="http://www.springframework.org/schema/context"
        xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:webflow="http://www.springframework.org/schema/webflow-config"
-       xmlns:faces="http://www.springframework.org/schema/faces-config"
+       xmlns:faces="http://www.springframework.org/schema/faces"
        xmlns:security="http://www.springframework.org/schema/security"
        xsi:schemaLocation="
            http://www.springframework.org/schema/beans
@@ -15,8 +15,8 @@
            http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
            http://www.springframework.org/schema/webflow-config
            http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.0.xsd
-           http://www.springframework.org/schema/faces-config
-           http://www.springframework.org/schema/faces-config/spring-faces-config-2.0.xsd
+           http://www.springframework.org/schema/faces
+           http://www.springframework.org/schema/faces/spring-faces-2.0.xsd
            http://www.springframework.org/schema/security
            http://www.springframework.org/schema/security/spring-security-2.0.xsd">