diff --git a/xep-0116.xml b/xep-0116.xml
index e91e010b..c4443ab7 100644
--- a/xep-0116.xml
+++ b/xep-0116.xml
@@ -2,39 +2,6 @@
 <!DOCTYPE xep SYSTEM 'xep.dtd' [
   <!ENTITY % ents SYSTEM 'xep.ent'>
 %ents;
-<!ENTITY esupy "e<span class='super'>y</span>">
-<!ENTITY dsupx "d<span class='super'>x</span>">
-<!ENTITY gsupx "g<span class='super'>x</span>">
-<!ENTITY gsupy "g<span class='super'>y</span>">
-<!ENTITY NsubA "N<span class='sub'>A</span>">
-<!ENTITY NsubB "N<span class='sub'>B</span>">
-<!ENTITY CsubA "C<span class='sub'>A</span>">
-<!ENTITY CsubB "C<span class='sub'>B</span>">
-<!ENTITY MsubA "M<span class='sub'>A</span>">
-<!ENTITY MsubB "M<span class='sub'>B</span>">
-<!ENTITY KMsubA "KM<span class='sub'>A</span>">
-<!ENTITY KMsubB "KM<span class='sub'>B</span>">
-<!ENTITY KCsubA "KC<span class='sub'>A</span>">
-<!ENTITY KCsubB "KC<span class='sub'>B</span>">
-<!ENTITY KSsubA "KS<span class='sub'>A</span>">
-<!ENTITY KSsubB "KS<span class='sub'>B</span>">
-<!ENTITY twosup32 "2<span class='super'>32</span>">
-<!ENTITY twosup2n "2<span class='super'>2n-1</span>">
-<!ENTITY CBeCAx2n1 "&CsubB; = &CsubA; XOR 2<span class='super'>n-1</span>">
-<!ENTITY IDA "ID<span class='sub'>A</span>">
-<!ENTITY IDB "ID<span class='sub'>B</span>">
-<!ENTITY formA "form<span class='sub'>A</span>">
-<!ENTITY formB "form<span class='sub'>B</span>">
-<!ENTITY formA2 "form<span class='sub'>A2</span>">
-<!ENTITY formB2 "form<span class='sub'>B2</span>">
-<!ENTITY macA "mac<span class='sub'>A</span>">
-<!ENTITY macB "mac<span class='sub'>B</span>">
-<!ENTITY signA "sign<span class='sub'>A</span>">
-<!ENTITY signB "sign<span class='sub'>B</span>">
-<!ENTITY pubKeyA "pubKey<span class='sub'>A</span>">
-<!ENTITY pubKeyB "pubKey<span class='sub'>B</span>">
-<!ENTITY signKeyA "signKey<span class='sub'>A</span>">
-<!ENTITY signKeyB "signKey<span class='sub'>B</span>">
 ]>
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
@@ -65,7 +32,7 @@
   </dependencies>
   <supersedes>None</supersedes>
   <supersededby>None</supersededby>
-  <shortname>esession</shortname>
+  <shortname>TO BE ASSIGNED</shortname>
   &ianpaterson;
   &stpeter;
   &dizzyd;
@@ -73,7 +40,7 @@
     <version>0.16</version>
     <date>2007-05-30</date>
     <initials>ip</initials>
-    <remark><p>Split pubkey field into init_pubkey and resp_pubkey fields</p></remark>
+    <remark><p>Split pubkey field into init_pubkey and resp_pubkey fields; modified namespaces to reflect XMPP Registrar procedures regarding URN issuance.</p></remark>
   </revision>
   <revision>
     <version>0.15</version>
@@ -195,7 +162,7 @@
   <query xmlns='http://jabber.org/protocol/disco#info'/>
 </iq>
   ]]></example>
-  <p>If Bob sends a disco#info reply and he supports the protocol defined herein, then he MUST include a service discovery feature variable of "urn:xmpp:esession".</p>
+  <p>If Bob sends a disco#info reply and he supports the protocol defined herein, then he MUST include a service discovery feature variable of "http://www.xmpp.org/extensions/xep-0116.html#ns" &NSNOTE;.</p>
   <example caption='Bob Returns disco#info Data'><![CDATA[
 <iq type='result'
     from='bob@example.com/laptop'
@@ -204,7 +171,7 @@
   <query xmlns='http://jabber.org/protocol/disco#info'>
     <identity category='client' type='pc'/>
     ...
-    <feature var='urn:xmpp:esession'/>
+    <feature var='http://www.xmpp.org/extensions/xep-0116.html#ns'/>
     ...
   </query>
 </iq>
@@ -630,7 +597,7 @@
       <field var='mac'><value> ** Integrity of identity ** </value></field>
     </x>
   </feature>
-  <c xmlns='urn:xmpp:crypt'>
+  <c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
     <data> ** Base64 encoded m_final ** </data>
     <mac> ** Base64 encoded a_mac ** </mac>
   </c>
@@ -707,7 +674,7 @@
         <example caption='Bob Sends Alice His Identity'><![CDATA[
 <message from='bob@example.com/laptop' to='alice@example.org/pda'>
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
-  <init xmlns='urn:xmpp:esession#init'>
+  <init xmlns='http://www.xmpp.org/extensions/xep-0116.html#ns-init'>
     <x type='result' xmlns='jabber:x:data'>
       <field var='FORM_TYPE'><value>urn:xmpp:ssn</value></field>
       <field var='nonce'><value> ** Alice's Base64 encoded ESession ID ** </value></field>
@@ -749,7 +716,7 @@
     <example caption='Alice Terminates an ESession'><![CDATA[
 <message from='alice@example.org/pda' to='bob@example.com/laptop'>
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
-  <c xmlns='urn:xmpp:crypt'>
+  <c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
     <data> ** Base64 encoded encrypted terminate form ** </data>
     <old> ** Base64 encoded old MAC key ** </old>
     <mac> ** Base64 encoded a_mac ** </mac>
@@ -760,7 +727,7 @@
     <example caption='Bob Acknowledges ESession Termination'><![CDATA[
 <message from='bob@example.com/laptop' to='alice@example.org/pda'>
   <thread>ffd7076498744578d10edabfe7f4a866</thread>
-  <c xmlns='urn:xmpp:crypt'>
+  <c xmlns='http://www.xmpp.org/extensions/xep-0200.html#ns'>
     <data> ** Base64 encoded encrypted acknowledgement form ** </data>
     <old> ** Base64 encoded old MAC key ** </old>
     <mac> ** Base64 encoded b_mac ** </mac>
@@ -909,18 +876,14 @@
 </section1>
 
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
-  <section2 topic='Namespaces' anchor='registrar-ns'>
-    <p>Upon approval of this document, the &REGISTRAR; shall register the following namespaces:</p>
-    <ul>
-      <li>urn:xmpp:esession</li>
-      <li>urn:xmpp:esession#init</li>
-    </ul>
+  <section2 topic='Protocol Namespaces' anchor='ns'>
+    <p>Until this specification advances to a status of Draft, its associated namespaces shall be "http://www.xmpp.org/extensions/xep-0116.html#ns" and "http://www.xmpp.org/extensions/xep-0116.html#ns-init"; upon advancement of this specification, the &REGISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.</p>
   </section2>
   <section2 topic='Field Standardization' anchor='registrar-formtype'>
     <p>&xep0068; defines a process for standardizing the fields used within Data Forms qualified by a particular namespace. The following fields shall be registered for use in <em>both</em> Encrypted Session Negotiation and Stanza Session Negotiation:</p>
     <code caption='Registry Submission'><![CDATA[
 <form_type>
-  <name>urn:xmpp:esession</name>
+  <name>http://www.xmpp.org/extensions/xep-0116.html#ns</name>
   <doc>XEP-0116</doc>
   <desc>ESession negotiation forms</desc>
   <field