diff --git a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
index 29ba4ceec..fd7bcce25 100644
--- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
@@ -65,7 +65,7 @@ public abstract class XMLMetaDataParser extends DefaultHandler
         (XMLMetaDataParser.class);
     private static boolean _schemaBug;
     
-    private static final String OPENJPA_NAMESPACE = "http://openjpa.apache.org/ns/orm";
+    private static final String OPENJPA_NAMESPACE = "http://www.apache.org/openjpa/ns/orm";
     protected int _extendedNamespace = 0;
     protected int _openjpaNamespace = 0;
 
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
index 8b3f0aaef..48e7d9a23 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/fetch-groups-orm.xml
@@ -17,8 +17,8 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" 
-	xmlns:openjpa="http://openjpa.apache.org/ns/orm" 
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" 
+	xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" 
 	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
index 0abe76dd7..5b6b9cdad 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/foreign-key-orm.xml
@@ -17,8 +17,8 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" 
-	xmlns:openjpa="http://openjpa.apache.org/ns/orm" 
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" 
+	xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" 
 	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
index 93b374d91..3bd6f8822 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/nonstandard-orm.xml
@@ -17,8 +17,8 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" 
-	xmlns:openjpa="http://openjpa.apache.org/ns/orm" 
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" 
+	xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" 
 	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
index 974553b43..8d16b31a8 100644
--- a/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/version-columns-orm.xml
@@ -17,8 +17,8 @@
  specific language governing permissions and limitations
  under the License.   
 -->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" 
-	xmlns:openjpa="http://openjpa.apache.org/ns/orm" 
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" 
+	xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" 
 	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	version="2.0">
diff --git a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
index 23ae38034..8be48f362 100644
--- a/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
+++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/embed/lazy/embed-lazy-orm.xml
@@ -17,8 +17,8 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<entity-mappings xmlns="http://openjpa.apache.org/ns/orm/extendable" 
-    xmlns:openjpa="http://openjpa.apache.org/ns/orm" 
+<entity-mappings xmlns="http://www.apache.org/openjpa/ns/orm/extendable" 
+    xmlns:openjpa="http://www.apache.org/openjpa/ns/orm" 
     xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
     version="2.0">
diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
index 33dd0bd05..cf8e5a66d 100644
--- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
+++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/extendable-orm.xsd
@@ -18,8 +18,8 @@
  under the License.   
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://openjpa.apache.org/ns/orm/extendable"
-	xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable"
+	targetNamespace="http://www.apache.org/openjpa/ns/orm/extendable"
+	xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable"
 	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
 	elementFormDefault="qualified"
 	attributeFormDefault="unqualified"
diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
index 5cb2fa458..1f1303f11 100644
--- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
+++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/openjpa-orm.xsd
@@ -18,15 +18,15 @@
  under the License.   
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://openjpa.apache.org/ns/orm" 
-	xmlns:openjpa-orm="http://openjpa.apache.org/ns/orm"
-	xmlns:extendable-orm="http://openjpa.apache.org/ns/orm/extendable" 
+	targetNamespace="http://www.apache.org/openjpa/ns/orm" 
+	xmlns:openjpa-orm="http://www.apache.org/openjpa/ns/orm"
+	xmlns:extendable-orm="http://www.apache.org/openjpa/ns/orm/extendable" 
 	xmlns:orm="http://java.sun.com/xml/ns/persistence/orm"
 	elementFormDefault="qualified"
 	attributeFormDefault="unqualified"
 	version="1.0">
 	
-	<xsd:import namespace="http://openjpa.apache.org/ns/orm/extendable"/>
+	<xsd:import namespace="http://www.apache.org/openjpa/ns/orm/extendable"/>
 	<xsd:import namespace="http://java.sun.com/xml/ns/persistence/orm"/>
 	
 	<!-- **************************************************** -->