diff --git a/xep-0369.xml b/xep-0369.xml
index ad015aae..6ce7b3fd 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -43,6 +43,7 @@
     <remark><p>
      Make example ids pseudo-random;
      Shorten the example BIND2 resources;
+     Fix Disco features to not use second namespace;
     </p></remark>
   </revision>
   <revision>
@@ -679,7 +680,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
         name='Shakespearean Chat Service'
         type='text'/>
     <feature var='urn:xmpp:mix:0'/>
-    <feature var='searchable' xmlns='urn:xmpp:mix:0'>
+    <feature var='urn:xmpp:mix:0#searchable'>
   </query>
 </iq>
 ]]></example>
@@ -688,8 +689,8 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
      </p>
     <ul>
       <li>'urn:xmpp:mix:0': This indicates support of MIX, and is returned by all MIX services.</li>
-      <li>'searchable': This is shown in the above example and indicates that a the MIX Service MAY be searched for channels.   This presence of this feature can be used by a client to guide the user to search for channels in a MIX service.</li>
-      <li>'create-channel': This is described in <link url='#usecase-admin-check-create'> Checking for Permission to Create a Channel</link> in support of channel administration.   When an end user client  needs to create channels, perhaps for short term usage, this feature helps the client to identify an MIX service to use.  It enables a configuration where permanent (searchable) channels are placed in one MIX service and clients will be able to create channels in another MIX service which is not searchable.</li>
+      <li>'urn:xmpp:mix:0#searchable': This is shown in the above example and indicates that a the MIX Service MAY be searched for channels.   This presence of this feature can be used by a client to guide the user to search for channels in a MIX service.</li>
+      <li>'urn:xmpp:mix:0#create-channel': This is described in <link url='#usecase-admin-check-create'> Checking for Permission to Create a Channel</link> in support of channel administration.   When an end user client  needs to create channels, perhaps for short term usage, this feature helps the client to identify an MIX service to use.  It enables a configuration where permanent (searchable) channels are placed in one MIX service and clients will be able to create channels in another MIX service which is not searchable.</li>
     </ul>
     <p>A MIX service MUST NOT advertise support for &xep0313;, as MAM is supported by the channels and not by the service.   A  MIX service MUST NOT advertise support for generic &xep0060;, as although MIX makes use of PubSub it is not a generic PubSub service.</p>
   </section2>
@@ -1312,12 +1313,12 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
     from='mix.shakespeare.example'
     id='7nve413p'>
     <query xmlns='http://jabber.org/protocol/disco#info'/>
-        <feature xmlns='urn:xmpp:mix:0' var='mix_nick_register'/>
+        <feature var='urn:xmpp:mix:0#mix_nick_register'/>
     </query>
 </iq>
 ]]></example>
       <p>
-        The response will be a list of features of the MIX channel.  If Nick Registration is supported, then the result set will include &lt;feature var="mix_nick_register"/&gt;.
+        The response will be a list of features of the MIX channel.  If Nick Registration is supported, then the result set will include &lt;feature var="urn:xmpp:mix:0#mix_nick_register"/&gt;.
       </p>
       <p>
         To register a nick with the MIX service the user sends
@@ -1794,7 +1795,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
 
     <section3 topic='Checking For Permission To Create a Channel' anchor='usecase-admin-check-create'>
       <p>
-        MIX does not standardize an access control model for creating and deleting MIX channels.    The choice is left to the MIX implementer, and could be a very simple or complex approach.  A client can determine if it has permission to create a channel on a MIX service, which MAY be used to control options presented to the user.   This is achieved by a disco command on the MIX service.   If the 'create-channel' feature is returned, the user is able to create a channel.
+        MIX does not standardize an access control model for creating and deleting MIX channels.    The choice is left to the MIX implementer, and could be a very simple or complex approach.  A client can determine if it has permission to create a channel on a MIX service, which MAY be used to control options presented to the user.   This is achieved by a disco command on the MIX service.   If the 'urn:xmpp:mix:0#create-channel' feature is returned, the user is able to create a channel.
       </p>
         <example caption="Client determines Capability to Create a Channel" ><![CDATA[
  <iq from='hag66@shakespeare.example/UUID-c8y/1573'
@@ -1814,7 +1815,7 @@ This approach  enables flexible support of multiple clients for a MIX channel pa
         name='Shakespearean Chat Service'
         type='text'/>
     <feature var='urn:xmpp:mix:0'/>
-    <feature var='create-channel' xmlns='urn:xmpp:mix:0'>
+    <feature var='urn:xmpp:mix:0#create-channel'>
   </query>
 </iq>
 ]]></example>