diff --git a/xep-0068.xml b/xep-0068.xml
index a7faf729..f7573b46 100644
--- a/xep-0068.xml
+++ b/xep-0068.xml
@@ -132,7 +132,7 @@
     ]]></example>
     </section2>
     <section2 topic='Correctly Specified FORM_TYPE' anchor='usecases-correct'>
-      <p>In the following example, the FORM_TYPE is 'http://jabber.org/protocol/pubsub', and all of the fields whose var names start with pubsub_ would be registered with the XMPP Registrar, associated with that namespace.</p>
+      <p>In the following example, the FORM_TYPE is 'http://jabber.org/protocol/pubsub', and all of the fields whose var names start with "pubsub#" would be registered with the XMPP Registrar, associated with that namespace.</p>
 
       <example caption='Message with FORM_TYPE'><![CDATA[
 <message to="node-owner" from="pubsub.jabber.org">
@@ -144,13 +144,10 @@
        <field var="FORM_TYPE" type="hidden">
            <value>http://jabber.org/protocol/pubsub</value>
        </field>
-       <field var="pubsub_node" type="hidden">
+       <field var="pubsub#node" type="hidden">
            <value>generic/pgm-mp3-player</value>
        </field>
-       <field var="pubsub_node_label" type="fixed">
-           <value>The pub-sub node is: generic/pgm-mp3-player</value>
-       </field>
-       <field var="pubsub_subscriber_jid" type="jid-single" 
+       <field var="pubsub#subscriber_jid" type="jid-single" 
               label="Jabber ID of Subscriber">
            <value>sub1@foo.com</value>
        </field>