diff --git a/xep-0189.xml b/xep-0189.xml
index b8b1dfae..cfa90ec1 100644
--- a/xep-0189.xml
+++ b/xep-0189.xml
@@ -20,7 +20,7 @@
   </dependencies>
   <supersedes>None</supersedes>
   <supersededby>None</supersededby>
-  <shortname>NOT YET ASSIGNED</shortname>
+  <shortname>NOT_YET_ASSIGNED</shortname>
   &ianpaterson;
   &stpeter;
   <author>
@@ -215,7 +215,7 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:tmp:pubkey'>
       <item id='julietPGPkey1hash'>
-        <keyinfo>
+        <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
           <name>julietPGPkey1hash</name>
           <openpgp>...</openpgp>
         </keyinfo>
@@ -251,7 +251,7 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='urn:xmpp:tmp:pubkey'>
       <item id='julietX509cert1hash'>
-        <keyinfo'>
+        <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
           <name>julietX509cert1hash</name>
           <x509cert>
             ...
@@ -274,7 +274,7 @@
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='urn:xmpp:tmp:pubkey'>
       <item id='julietX509cert1hash'>
-        <keyinfo'>
+        <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
           <name>julietX509cert1hash</name>
           <x509cert>
             ...
@@ -317,13 +317,13 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <items node='urn:xmpp:tmp:pubkey'>
       <item id='julietPGPkey1hash'>
-        <keyinfo'>
+        <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
           <name>julietPGPkey1hash</name>
           ...
         </keyinfo>
       </item>
       <item id='julietX509cert1hash'>
-        <keyinfo'>
+        <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
           <name>julietX509cert1hash</name>
           ...
         </keyinfo>
@@ -352,7 +352,7 @@
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <items node='urn:xmpp:tmp:pubkey'>
       <item id='julietX509cert1hash'>
-        <keyinfo'>
+        <keyinfo xmlns='urn:xmpp:tmp:pubkey'>
           <name>julietX509cert1hash</name>
           ...
         </keyinfo>
@@ -528,18 +528,36 @@
         <xs:element name='x509' type='xs:string'/>
         <xs:element name='openpgp' type='xs:string'/>
       </xs:choice>
-      <xs:element ref='signature' minOccurs='0' maxOccurs='unbound'/>
+      <xs:element ref='signature' minOccurs='0' maxOccurs='unbounded'/>
     </xs:complexType>
   </xs:element>
 
   <xs:element name='signature'>
     <xs:complexType>
-      <xs:element name='issuer' type='xs:string'>
-        <xs:attribute name='jid' type='xs:string' use='optional'/>
-      </<xs:element>
-      <xs:element name='value' type='xs:string'>
-        <xs:attribute name='method' type='xs:string' use='optional'/>
-      </<xs:element>
+      <xs:sequence>
+        <xs:element ref='issuer'/>
+        <xs:element ref='value'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='issuer'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='jid' type='xs:string' use='required'/>
+        </xs:extension>
+      </xs:simpleContent>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='value'>
+    <xs:complexType>
+      <xs:simpleContent>
+        <xs:extension base='xs:string'>
+          <xs:attribute name='method' type='xs:string' use='required'/>
+        </xs:extension>
+      </xs:simpleContent>
     </xs:complexType>
   </xs:element>