diff --git a/inbox/xml-media-element.xml b/inbox/xml-media-element.xml
index 11ce76d6..3a897a18 100644
--- a/inbox/xml-media-element.xml
+++ b/inbox/xml-media-element.xml
@@ -30,6 +30,12 @@
     <jid>binary@jrudevels.org</jid>
     <uri>http://jrudevels.org/</uri>
   </author>
+  <revision>
+    <version>0.0.2</version>
+    <date>2012-06-21</date>
+    <initials>snd</initials>
+    <remark><p>Root element name changed to "wrapper"; xmlns fixed in the XML-schema.</p></remark>
+  </revision>
   <revision>
     <version>0.0.1</version>
     <date>2012-06-13</date>
@@ -43,10 +49,10 @@
 </section1>
 
 <section1 topic='Media Element' anchor='media'>
-  <p>The root element for XML-data is &lt;xml/&gt;. This element MUST be qualified by the "urn:xmpp:xml-element" namespace. The &lt;xml/&gt; element MUST be contained within a &lt;field/&gt; element qualified by the 'jabber:x:data' namespace.</p>
-  <p>The &lt;xml/&gt; element SHOULD contain an XML-data which needs to be represented in a form.</p>
+  <p>The root element for XML-data is &lt;wrapper/&gt;. This element MUST be qualified by the "urn:xmpp:xml-element" namespace. The &lt;wrapper/&gt; element MUST be contained within a &lt;field/&gt; element qualified by the 'jabber:x:data' namespace.</p>
+  <p>The &lt;wrapper/&gt; element SHOULD contain an XML-data which needs to be represented in a form.</p>
   <example caption='PubSub Blog Node Metadata'><![CDATA[
-<xml xmlns='urn:xmpp:xml-element'>
+<wrapper xmlns='urn:xmpp:xml-element'>
   <feed xmlns='http://www.w3.org/2005/Atom'>
     <title>Romeo&amp;apos;s Microblog</title>
     <id>tag:montague.lit,2008:home</id>
@@ -56,13 +62,13 @@
       <uri>xmpp:romeo@montague.lit</uri>
     </author>
   </feed>
-</xml>
+</wrapper>
   ]]></example>
   <example caption='Inclusion in Data Form'><![CDATA[
 <x xmlns='jabber:x:data' type='form'>
   [ ... ]
   <field var='xml-metadata' type='hidden'>
-    <xml xmlns='urn:xmpp:xml-element'>
+    <wrapper xmlns='urn:xmpp:xml-element'>
       <feed xmlns='http://www.w3.org/2005/Atom'>
         <title>Romeo&amp;apos;s Microblog</title>
         <id>tag:montague.lit,2008:home</id>
@@ -72,7 +78,7 @@
           <uri>xmpp:romeo@montague.lit</uri>
         </author>
       </feed>
-    </xml>
+    </wrapper>
   </field>
   [ ... ]
 </x>
@@ -100,8 +106,8 @@
 
 <xs:schema
     xmlns:xs='http://www.w3.org/2001/XMLSchema'
-    targetNamespace='urn:xmpp:media-element'
-    xmlns='urn:xmpp:media-element'
+    targetNamespace='urn:xmpp:xml-element'
+    xmlns='urn:xmpp:xml-element'
     elementFormDefault='qualified'>
 
   <xs:annotation>
@@ -111,7 +117,7 @@
     </xs:documentation>
   </xs:annotation>
 
-  <xs:element name='xml'>
+  <xs:element name='wrapper'>
     <xs:complexType>
       <xs:sequence>
         <xs:any minOccurs='0' maxOccurs='unbounded'/>