diff --git a/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml b/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml
index ec49d198..56f17595 100644
--- a/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml
+++ b/oxm-tiger/src/test/resources/org/springframework/oxm/config/jaxb2OxmNamespaceHandlerTest.xml
@@ -1,8 +1,8 @@
 <?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:oxm="http://www.springframework.org/schema/spring-ws/oxm" xsi:schemaLocation="
+       xmlns:oxm="http://www.springframework.org/schema/oxm" xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/spring-ws/oxm http://www.springframework.org/schema/spring-ws/spring-oxm-1.5.xsd">
+       http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd">
     <oxm:jaxb2-marshaller id="contextPathMarshaller" contextPath="org.springframework.oxm.jaxb2"/>
     <oxm:jaxb2-marshaller id="classesMarshaller">
         <oxm:class-to-be-bound name="org.springframework.oxm.jaxb2.Flights"/>
diff --git a/oxm/src/main/resources/META-INF/spring.handlers b/oxm/src/main/resources/META-INF/spring.handlers
index c11a73e4..22a2a504 100644
--- a/oxm/src/main/resources/META-INF/spring.handlers
+++ b/oxm/src/main/resources/META-INF/spring.handlers
@@ -1 +1 @@
-http\://www.springframework.org/schema/spring-ws/oxm=org.springframework.oxm.config.OxmNamespaceHandler
\ No newline at end of file
+http\://www.springframework.org/schema/oxm=org.springframework.oxm.config.OxmNamespaceHandler
\ No newline at end of file
diff --git a/oxm/src/main/resources/META-INF/spring.schemas b/oxm/src/main/resources/META-INF/spring.schemas
index 93a72bd8..43b7186b 100644
--- a/oxm/src/main/resources/META-INF/spring.schemas
+++ b/oxm/src/main/resources/META-INF/spring.schemas
@@ -1 +1 @@
-http\://www.springframework.org/schema/spring-ws/spring-oxm-1.5.xsd=/org/springframework/oxm/config/spring-oxm-1.5.xsd
\ No newline at end of file
+http\://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd=/org/springframework/oxm/config/spring-oxm-1.5.xsd
\ No newline at end of file
diff --git a/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd b/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
index 52565021..a81a43a5 100644
--- a/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
+++ b/oxm/src/main/resources/org/springframework/oxm/config/spring-oxm-1.5.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<xsd:schema xmlns="http://www.springframework.org/schema/spring-ws/oxm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xsd:schema xmlns="http://www.springframework.org/schema/oxm" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
             xmlns:beans="http://www.springframework.org/schema/beans"
             xmlns:tool="http://www.springframework.org/schema/tool"
-            targetNamespace="http://www.springframework.org/schema/spring-ws/oxm" elementFormDefault="qualified"
+            targetNamespace="http://www.springframework.org/schema/oxm" elementFormDefault="qualified"
             attributeFormDefault="unqualified">
 
     <xsd:import namespace="http://www.springframework.org/schema/beans"/>
diff --git a/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml b/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
index ebb9175b..861a41eb 100644
--- a/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
+++ b/oxm/src/test/resources/org/springframework/oxm/config/oxmNamespaceHandlerTest.xml
@@ -1,8 +1,8 @@
 <?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:oxm="http://www.springframework.org/schema/spring-ws/oxm" xsi:schemaLocation="
+       xmlns:oxm="http://www.springframework.org/schema/oxm" xsi:schemaLocation="
        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-       http://www.springframework.org/schema/spring-ws/oxm http://www.springframework.org/schema/spring-ws/spring-oxm-1.5.xsd">
+       http://www.springframework.org/schema/oxm http://www.springframework.org/schema/oxm/spring-oxm-1.5.xsd">
     <oxm:jaxb1-marshaller id="jaxb1Marshaller" contextPath="org.springframework.oxm.jaxb1"/>
     <oxm:jibx-marshaller id="jibxMarshaller" target-class="org.springframework.oxm.jibx.Flights"/>
     <oxm:xmlbeans-marshaller id="xmlBeansMarshaller" options="xmlBeansOptions"/>