diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in
index d19bc579a4..6ebd23549f 100644
--- a/docs/formatstorage.html.in
+++ b/docs/formatstorage.html.in
@@ -535,7 +535,7 @@
         provide the XML namespace attribute syntax as follows:
 
         <p>
-        xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'
+        xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'
         </p>
 
         <p>
@@ -551,7 +551,7 @@
         The following XML snippet shows the syntax required in order to
         utilize for a netfs pool:
       <pre>
-&lt;pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'&gt;
+&lt;pool type="netfs" xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'&gt;
   &lt;name&gt;nfsimages&lt;/name&gt;
 ...
   &lt;source&gt;
@@ -580,7 +580,7 @@
         syntax as follows:
 
         <p>
-        xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'
+        xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'
         </p>
 
         <p>
@@ -598,7 +598,7 @@
         The following XML snippet shows the syntax required in order to
         utilize
       <pre>
-&lt;pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'&gt;
+&lt;pool type="rbd" xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'&gt;
   &lt;name&gt;myrbdpool&lt;/name&gt;
 ...
   &lt;source&gt;
diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index e1944ff8e1..3907f70afe 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -697,7 +697,7 @@
     -->
 
   <define name="fs_mount_opts">
-    <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/source/fs/1.0">
+    <element name="mount_opts" ns="http://libvirt.org/schemas/storagepool/fs/1.0">
       <zeroOrMore>
         <element name="option">
           <attribute name='name'>
@@ -714,7 +714,7 @@
     -->
 
   <define name="rbd_config_opts">
-    <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/source/rbd/1.0">
+    <element name="config_opts" ns="http://libvirt.org/schemas/storagepool/rbd/1.0">
       <zeroOrMore>
         <element name="option">
           <attribute name='name'>
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 0ec99c60ed..ddb422d874 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -562,7 +562,7 @@ virStorageBackendFileSystemBuild(virStoragePoolObjPtr pool,
 
 #if WITH_STORAGE_FS
 
-# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/fs/1.0"
+# define STORAGE_POOL_FS_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/fs/1.0"
 
 /* Backend XML Namespace handling for fs or netfs specific mount options to
  * be added to the mount -o {options_list} command line that are not otherwise
diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c
index 2348f80146..cfbce1ad19 100644
--- a/src/storage/storage_backend_rbd.c
+++ b/src/storage/storage_backend_rbd.c
@@ -59,7 +59,7 @@ struct _virStoragePoolRBDConfigOptionsDef {
     char **values;
 };
 
-#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/source/rbd/1.0"
+#define STORAGE_POOL_RBD_NAMESPACE_HREF "http://libvirt.org/schemas/storagepool/rbd/1.0"
 
 static void
 virStoragePoolDefRBDNamespaceFree(void *nsdata)
diff --git a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
index 0434b16eb7..c2777ed29d 100644
--- a/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
   <name>nfsimages</name>
   <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid>
   <capacity>0</capacity>
diff --git a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
index 6b62aa6f7e..a924fc103d 100644
--- a/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlin/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
   <name>ceph</name>
   <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid>
   <source>
diff --git a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
index 4bd164f220..fdc332087f 100644
--- a/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-netfs-ns-mountopts.xml
@@ -1,4 +1,4 @@
-<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/source/fs/1.0'>
+<pool type='netfs' xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'>
   <name>nfsimages</name>
   <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</uuid>
   <capacity unit='bytes'>0</capacity>
diff --git a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
index 342a0ff74a..7fbcc3e0bc 100644
--- a/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
+++ b/tests/storagepoolxml2xmlout/pool-rbd-ns-configopts.xml
@@ -1,4 +1,4 @@
-<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/source/rbd/1.0'>
+<pool type='rbd' xmlns:rbd='http://libvirt.org/schemas/storagepool/rbd/1.0'>
   <name>ceph</name>
   <uuid>47c1faee-0207-e741-f5ae-d9b019b98fe2</uuid>
   <capacity unit='bytes'>0</capacity>