diff --git a/xep-0197.xml b/xep-0197.xml
index 1c9f9f47..a70c620f 100644
--- a/xep-0197.xml
+++ b/xep-0197.xml
@@ -21,7 +21,7 @@
   </dependencies>
   <supersedes/>
   <supersededby/>
-  <shortname>TO BE ASSIGNED</shortname>
+  <shortname>NOT_YET_ASSIGNED</shortname>
   &stpeter;
   <author>
     <firstname>Kevin</firstname>
@@ -29,6 +29,12 @@
     <email>kevin.hoekman@pandora.be</email>
     <jid>kevinh@jabber.org</jid>
   </author>
+  <revision>
+    <version>0.3</version>
+    <date>2008-09-25</date>
+    <initials>psa</initials>
+    <remark><p>Modified namespace in accordance with protocol versioning policies.</p></remark>
+  </revision>
   <revision>
     <version>0.2</version>
     <date>2007-10-03</date>
@@ -44,7 +50,7 @@
   <revision>
     <version>0.0.1</version>
     <date>2006-08-28</date>
-    <initials>psa</initials>
+    <initials>psa/kh</initials>
     <remark><p>First draft.</p></remark>
   </revision>
 </header>
@@ -53,7 +59,7 @@
 </section1>
 <section1 topic='Protocol' anchor='protocol'>
   <section2 topic='Container Element and Child Elements' anchor='protocol-elements'>
-    <p>Information about video viewing is provided by the user (or automated integration with video systems) and is propagated on the network by the user's client. The information container for video viewing data is a &lt;video/&gt; element that is qualified by the 'http://www.xmpp.org/extensions/xep-0197.html#ns' namespace. The video information itself is provided as the XML character data of the following children of the &lt;video/&gt; element:</p>
+    <p>Information about video viewing is provided by the user (or automated integration with video systems) and is propagated on the network by the user's client. The information container for video viewing data is a &lt;video/&gt; element that is qualified by the 'urn:xmpp:viewing:0' namespace. The video information itself is provided as the XML character data of the following children of the &lt;video/&gt; element:</p>
     <table caption='Child Elements'>
       <tr>
         <th>Element</th>
@@ -150,13 +156,13 @@
     <p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p>
   </section2>
   <section2 topic='Transport Mechanism' anchor='protocol-transport'>
-    <p>When a user starts watching a video, its client may publish that fact to a PEP node whose NodeID is "http://www.xmpp.org/extensions/xep-0197.html#ns" &NSNOTE; or to a generic pubsub node. Because viewing information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to the &PRESENCE; stanza type.</p>
+    <p>When a user starts watching a video, its client may publish that fact to a PEP node whose NodeID is "urn:xmpp:viewing:0" &NSNOTE; or to a generic pubsub node. Because viewing information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to the &PRESENCE; stanza type.</p>
     <example caption='User Publishes Viewing Information'><![CDATA[
 <iq type='set' from='stpeter@jabber.org/work' id='viewing1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
-    <publish node='http://www.xmpp.org/extensions/xep-0197.html#ns'>
+    <publish node='urn:xmpp:viewing:0'>
       <item id='8eaa8ae16651455376dab4eae45772337e9ec372'>
-        <video xmlns='http://www.xmpp.org/extensions/xep-0197.html#ns'>
+        <video xmlns='urn:xmpp:viewing:0'>
           <name>Mystery Science Theater 3000</name>
           <episode>807</episode>
           <description>Terror From The Year 5000</description>
@@ -171,9 +177,9 @@
     <example caption='Viewing Information is Delivered to All Subscribers'><![CDATA[
 <message from='stpeter@jabber.org' to='maineboy@jabber.org'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
-    <items node='http://www.xmpp.org/extensions/xep-0197.html#ns'>
+    <items node='urn:xmpp:viewing:0'>
       <item id='8eaa8ae16651455376dab4eae45772337e9ec372'>
-        <video xmlns='http://www.xmpp.org/extensions/xep-0197.html#ns'>
+        <video xmlns='urn:xmpp:viewing:0'>
           <name>Mystery Science Theater 3000</name>
           <episode>807</episode>
           <description>Terror From The Year 5000</description>
@@ -183,16 +189,14 @@
     </items>
   </event>
 </message>
-
-[ ... ]
     ]]></example>
     <p>When the user stops watching the video, the user's client SHOULD send an empty &lt;video/&gt; element with the same ItemID:</p>
     <example caption='User Publishes Stop Information'><![CDATA[
 <iq type='set' from='stpeter@jabber.org/work' id='viewing2'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
-    <publish node='http://www.xmpp.org/extensions/xep-0197.html#ns'>
+    <publish node='urn:xmpp:viewing:0'>
       <item id='8eaa8ae16651455376dab4eae45772337e9ec372'>
-        <video xmlns='http://www.xmpp.org/extensions/xep-0197.html#ns'/>
+        <video xmlns='urn:xmpp:viewing:0'/>
       </item>
     </publish>
   </pubsub>
@@ -201,15 +205,13 @@
     <example caption='Stop Information is Delivered to All Subscribers'><![CDATA[
 <message from='stpeter@jabber.org' to='maineboy@jabber.org'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
-    <items node='http://www.xmpp.org/extensions/xep-0197.html#ns'>
+    <items node='urn:xmpp:viewing:0'>
       <item id='8eaa8ae16651455376dab4eae45772337e9ec372'>
-        <video xmlns='http://www.xmpp.org/extensions/xep-0197.html#ns'/>
+        <video xmlns='urn:xmpp:viewing:0'/>
       </item>
     </items>
   </event>
 </message>
-
-[ ... ]
     ]]></example>
   </section2>
 </section1>
@@ -220,8 +222,15 @@
   <p>This document requires no interaction with &IANA;.</p>
 </section1>
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
-  <section2 topic='Protocol Namespaces' anchor='ns'>
-    <p>Until this specification advances to a status of Draft, its associated namespace shall be "http://www.xmpp.org/extensions/xep-0197.html#ns"; upon advancement of this specification, the &REGISTRAR; shall issue a permanent namespace in accordance with the process defined in Section 4 of &xep0053;.</p>
+  <section2 topic='Protocol Namespaces' anchor='registrar-ns'>
+    <p>This specification defines the following XML namespace:</p>
+    <ul>
+      <li>urn:xmpp:viewing:0</li>
+    </ul>
+    <p>Upon advancement of this specification from a status of Experimental to a status of Draft, the &REGISTRAR; shall add the foregoing namespaces to the registry located at &NAMESPACES;, as described in Section 4 of &xep0053;.</p>
+  </section2>
+  <section2 topic='Namespace Versioning' anchor='registrar-versioning'>
+    <p>If the protocol defined in this specification undergoes a major revision that is not fully backward-compatible with an older version, or that contains significant new features, the XMPP Registrar shall increment the protocol version number found at the end of the XML namespaces defined herein, as described in Section 4 of <cite>XEP-0053</cite>.</p>
   </section2>
 </section1>
 <section1 topic='XML Schema' anchor='schema'>
@@ -230,8 +239,8 @@
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    targetNamespace='http://www.xmpp.org/extensions/xep-0197.html#ns'
-    xmlns='http://www.xmpp.org/extensions/xep-0197.html#ns'
+    targetNamespace='urn:xmpp:viewing:0'
+    xmlns='urn:xmpp:viewing:0'
     elementFormDefault='qualified'>
 
   <xs:element name='room'>