diff --git a/xep-0331.xml b/xep-0331.xml
index 08511737..53f13538 100644
--- a/xep-0331.xml
+++ b/xep-0331.xml
@@ -8,7 +8,7 @@
     <header>
         <title>Data Forms - Color Field Types</title>
         <abstract>This specification defines how to publish fields in data forms that take color values. Color values are best edited using a color picker dialog, rather than manual input.</abstract>
-        &LEGALNOTICE;
+		&LEGALNOTICE;
         <number>0331</number>
         <status>Experimental</status>
         <type>Standards Track</type>
@@ -23,20 +23,30 @@
         </dependencies>
         <supersedes/>
         <supersededby/>
-        <shortname>NOT_YET_ASSIGNED</shortname>
+        <shortname>color-parameter</shortname>
         <author>
             <firstname>Peter</firstname>
             <surname>Waher</surname>
             <email>peter.waher@clayster.com</email>
             <jid>peter.waher@jabber.org</jid>
-            <uri>http://se.linkedin.com/pub/peter-waher/1a/71b/a29/</uri>
+            <uri>http://www.linkedin.com/in/peterwaher</uri>
         </author>
-       <revision>
-         <version>0.1</version>
-         <date>2013-06-26</date>
-         <initials>psa</initials>
-         <remark><p>Initial published version approved by the XMPP Council.</p></remark>
-       </revision>
+		<revision>
+			<version>0.2</version>
+			<date>2014-03-10</date>
+			<initials>pw</initials>
+			<remark>
+				<p>Namespace changed to urn:xmpp:xdata:color.</p>
+			</remark>
+		</revision>
+		<revision>
+			<version>0.1</version>
+			<date>2013-06-26</date>
+			<initials>psa</initials>
+			<remark>
+				<p>Initial published version approved by the XMPP Council.</p>
+			</remark>
+		</revision>
 		<revision>
 			<version>0.0.2</version>
 			<date>2013-06-11</date>
@@ -85,7 +95,7 @@
     <field var='color' type='text-single' label='Color:'>
         <desc>Choose a color.</desc>
         <xdv:validate xmlns:xdv='http://jabber.org/protocol/xdata-validate'
-                      xmlns:xdc='http://jabber.org/protocol/xdata-color'
+                      xmlns:xdc='urn:xmpp:xdata:color'
                       datatype='xdc:Color'>
             <xdv:regex>^[0-9a-fA-F]{6}$</xdv:regex>
         </xdv:validate>
@@ -120,7 +130,7 @@
     <field var='color' type='text-single' label='Color:'>
         <desc>Choose a color.</desc>
         <xdv:validate xmlns:xdv='http://jabber.org/protocol/xdata-validate'
-                      xmlns:xdc='http://jabber.org/protocol/xdata-color'
+                      xmlns:xdc='urn:xmpp:xdata:color'
                       datatype='xdc:ColorAlpha'>
             <xdv:regex>^[0-9a-fA-F]{8}$</xdv:regex>
         </xdv:validate>
@@ -158,7 +168,7 @@
     <datatype-prefix>
         <prefix>xdc</prefix>
         <desc>defines the Color data type</desc>
-        <doc>color-parameter.html</doc>
+        <doc>http://xmpp.org/extensions/xep-0331.html</doc>
     </datatype-prefix>]]>
 			</code>
 		</section2>
@@ -203,8 +213,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    targetNamespace='http://jabber.org/protocol/xdata-color'
-    xmlns='http://jabber.org/protocol/xdata-color'
+    targetNamespace='urn:xmpp:xdata:color'
+    xmlns='urn:xmpp:xdata:color'
     elementFormDefault='qualified'>
  
     <xs:simpleType name='Color'>