Index: jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java
===================================================================
--- jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java	(revision 639515)
+++ jackrabbit-jcr-commons/src/main/java/org/apache/jackrabbit/util/name/NamespaceAdder.java	(working copy)
@@ -39,10 +39,10 @@
     public void addNamespaces(NamespaceMapping nsm)
             throws NamespaceException, UnsupportedRepositoryOperationException, RepositoryException {
         Map m = nsm.getPrefixToURIMapping();
-        for (Iterator i = m.values().iterator(); i.hasNext();) {
+        for (Iterator i = m.entrySet().iterator(); i.hasNext();) {
             Map.Entry e = (Map.Entry) i.next();
             String prefix = (String) e.getKey();
-            String uri = (String) e.getKey();
+            String uri = (String) e.getValue();
             registry.registerNamespace(prefix, uri);
         }
     }
Index: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceAdder.java
===================================================================
--- jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceAdder.java	(revision 639515)
+++ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/namespace/NamespaceAdder.java	(working copy)
@@ -34,10 +34,10 @@
     public void addNamespaces(NamespaceMapping nsm)
             throws NamespaceException, UnsupportedRepositoryOperationException, RepositoryException {
         Map m = nsm.getPrefixToURIMapping();
-        for (Iterator i = m.values().iterator(); i.hasNext();) {
+        for (Iterator i = m.entrySet().iterator(); i.hasNext();) {
             Map.Entry e = (Map.Entry) i.next();
             String prefix = (String) e.getKey();
-            String uri = (String) e.getKey();
+            String uri = (String) e.getValue();
             registry.registerNamespace(prefix, uri);
         }
     }