diff --git a/inbox/entityversioning.xml b/inbox/entityversioning.xml
index a895be2c..16dec0d4 100644
--- a/inbox/entityversioning.xml
+++ b/inbox/entityversioning.xml
@@ -142,7 +142,7 @@
       If a server supports entity versioning, it MUST inform the connecting
       client when returning stream features during the stream negotiation
       process. This is done by including a <ver/> element, qualified by
-      the 'urn:xmpp:features:entityver:0' namespace. At the latest, this SHOULD
+      the 'urn:xmpp:entityver:0' namespace. At the latest, this SHOULD
       be done when informing a client that resource binding is required. For
       example:
     </p>
@@ -151,7 +151,7 @@
   <bind xmlns='urn:ietf:params:xml:ns:xmpp-bind'>
     <required/>
   </bind>
-  <ver xmlns='urn:xmpp:features:entityver:0'/>
+  <ver xmlns='urn:xmpp:entityver:0'/>
 </stream:features>
     ]]></example>
   <p>
@@ -190,10 +190,10 @@
 <iq from='romeo@montague.lit/home' id='56' to='romeo@montague.lit' type='get'>
   <query xmlns='jabber:iq:roster'>
     <item jid='bill@shakespeare.lit'>
-      <version xmlns='urn:xmpp:features:entityver:0'>25P2A7H8</version>
+      <version xmlns='urn:xmpp:entityver:0'>25P2A7H8</version>
     </item>
     <item jid='anne@shakespeare.lit'>
-      <version xmlns='urn:xmpp:features:entityver:0'>VIZSVF0D</version>
+      <version xmlns='urn:xmpp:entityver:0'>VIZSVF0D</version>
     </item>
   </query>
 </iq>
@@ -202,7 +202,7 @@
 <iq from='romeo@montague.lit' id='56' to='romeo@montague.lit/home' type='result>
     <query xmlns='jabber:iq:roster'>
       <item subscription='both' jid='bill@shakespeare.lit' />
-      <version xmlns='urn:xmpp:features:entityver:0'>9ZFZXVP9</version>
+      <version xmlns='urn:xmpp:entityver:0'>9ZFZXVP9</version>
       </item>
     </query>
 </iq>
@@ -219,7 +219,7 @@
 <iq from='romeo@montague.lit' id='ah382g678jka7' to='romeo@montague.lit/home' type='set'>
     <query xmlns='jabber:iq:roster' ver='ver34'>
       <item jid='tybalt@shakespeare.lit' subscription='remove>
-        <version xmlns='urn:xmpp:features:entityver:0'>XWE4MUUP</version>
+        <version xmlns='urn:xmpp:entityver:0'>XWE4MUUP</version>
       </item>
     </query>
 </iq>
@@ -233,10 +233,10 @@
     type='get'>
   <query xmlns='http://jabber.org/protocol/disco#items>
     <item jid='coven@chat.shakespeare.lit'>
-      <version xmlns='urn:xmpp:features:entityver:0'>25P2A7H8</version>
+      <version xmlns='urn:xmpp:entityver:0'>25P2A7H8</version>
     </item>
     <item jid='inverness@chat.shakespeare.lit'>
-      <version xmlns='urn:xmpp:features:entityver:0'>4OLGSVNY</version>
+      <version xmlns='urn:xmpp:entityver:0'>4OLGSVNY</version>
     </item>
   </query>
 </iq>
@@ -249,7 +249,7 @@
   <query xmlns='http://jabber.org/protocol/disco#items'>
     <item jid='coven@chat.shakespeare.lit'
           name='A Dark Cave'>
-        <version xmlns='urn:xmpp:features:entityver:0'>VIZSVF0D</version>
+        <version xmlns='urn:xmpp:entityver:0'>VIZSVF0D</version>
     </item>
   </query>
 </iq>
@@ -297,12 +297,12 @@ anne@shakespeare.lit:VIZSVF0D,bill@shakespeare.lit:25P2A7H8
 
     <!-- Client -->
     <iq to='bill@shakespeare.lit' type='get' id='bill1'>
-      <query xmlns='urn:xmpp:features:entityver:0' type='jabber:iq:roster' />
+      <query xmlns='urn:xmpp:entityver:0' type='jabber:iq:roster' />
     </iq>
 
     <!-- Server -->
     <iq to='bill@shakespeare.lit/home' type='result' id='bill1'>
-      <query xmlns='urn:xmpp:features:entityver:0' type='jabber:iq:roster'>
+      <query xmlns='urn:xmpp:entityver:0' type='jabber:iq:roster'>
         0514fc90e6c7981b06bbb2173bb8ef03
       </query>
     </iq>
@@ -314,12 +314,12 @@ anne@shakespeare.lit:VIZSVF0D,bill@shakespeare.lit:25P2A7H8
   <example caption="MUC rooms aggregate token request"><![CDATA[
     <!-- Client -->
     <iq to='chat.shakespeare.lit' type='get' id='bill2'>
-      <query xmlns='urn:xmpp:features:entityver:0' type='http://jabber.org/protocol/disco#items' />
+      <query xmlns='urn:xmpp:entityver:0' type='http://jabber.org/protocol/disco#items' />
     </iq>
 
     <!-- Server -->
     <iq to='bill@shakespeare.lit/home' type='result' id='bill2'>
-      <query xmlns='urn:xmpp:features:entityver:0' type='http://jabber.org/protocol/disco#items'>
+      <query xmlns='urn:xmpp:entityver:0' type='http://jabber.org/protocol/disco#items'>
         32151d1d01440d5536a7f106afd3f4d8
       </query>
     </iq>
@@ -379,7 +379,7 @@ anne@shakespeare.lit:VIZSVF0D,bill@shakespeare.lit:25P2A7H8
   <section2 topic='Protocol Namespaces' anchor='registrar-ns'>
     <p>This specification defines the following XML namespace:</p>
     <ul>
-      <li>urn:xmpp:features:entityver:0</li>
+      <li>urn:xmpp:entityver:0</li>
     </ul>
     <p>
       Upon advancement of this specification from a status of Experimental to a