diff --git a/xep-0369.xml b/xep-0369.xml
index 33eba9a5..fafca180 100644
--- a/xep-0369.xml
+++ b/xep-0369.xml
@@ -678,7 +678,7 @@
   </join>
 </iq>
 ]]></example>
-      <p>The channel responds with an IQ-result. This stanza includes the nodes to which the user has been successfully subscribed, as well as the bare JID that will be used for the user in this channel and added to the participant list.  If a user cannot be subscribed to one or more of the requested nodes (e.g., because the node does not exist), but can be subscribed to some the response simply lists the nodes successfully subscribed.    If none of the nodes requested are successfully subscribed to, an error response is sent indicating the reason that the first node requested was not subscribed to.   This response will also include other nodes requested where subscription failed for the same reason.  A user may subsequently request subscription to nodes in a channel to which the user was not initially subscribed.  </p>
+      <p>The channel responds with an IQ-result. This stanza includes the nodes to which the user has been successfully subscribed, as well as the bare JID that will be used for the user in this channel and added to the participant list.  If a user cannot be subscribed to one or more of the requested nodes (e.g., because the node does not exist), but can be subscribed to some the response simply lists the nodes successfully subscribed.    If none of the nodes requested are successfully subscribed to, an error response is sent indicating the reason that the first node requested was not subscribed to.   This response will also include other nodes requested where subscription failed for the same reason.  A user may subsequently request subscription to nodes in a channel to which the user was not initially subscribed, by repeating the join operation.  If the user is already joined to a channel, the join operation simply modifies the channel subscriptions and settings to new values.</p>
       <example caption="Channel Successfully Processes Join"><![CDATA[
 <iq type='result'
     from='coven@mix.shakespeare.example'
@@ -734,9 +734,9 @@
        A user  JID visibility preference have the following values:
      </p>
      <ol>
-       <li>'Use Channel Default'.   In this setting, the channel default value will be used.  This value is used if another value is not explicitly set.</li>
-       <li>'Never Show JID'.  If this is set, JID will never be shared and user will be removed from the channel if its mode changes to JID-visible-mandatory.</li>
-       <li>'Prefer Not Show JID'.   If this is set, JID will only be shared if mode is JID-visible-mandatory.</li>
+       <li>'Default'.   In this setting, the channel default value will be used.  This value is used if another value is not explicitly set.</li>
+       <li>'Never'.  If this is set, JID will never be shared and user will be removed from the channel if its mode changes to JID-visible-mandatory.</li>
+       <li>'Prefer Not'.   If this is set, JID will only be shared if mode is JID-visible-mandatory.</li>
      </ol>
      <p>
       The user may specify that no Private Messages are to be sent from the channel, and allow vCard retrieval.
@@ -747,7 +747,7 @@
      <table caption="Standard User Preference Options">
        <tr><th>Option</th> <th>Values</th><th>Default</th></tr>
        
-       <tr><td>'JID Visibility'</td> <td>'Use Channel Default', 'Never Show JID',  'Prefer Not Show JID'</td>  <td>'Use Channel Default'</td></tr>
+       <tr><td>'JID Visibility'</td> <td>'Default', 'Never',  'Prefer Not'</td>  <td>'Use Channel Default'</td></tr>
        
        <tr><td>'Private Messages'</td><td>'Allow', 'Block'</td> <td>'Allow'</td></tr>
        
@@ -769,7 +769,7 @@
              <value>urn:xmpp:mix:0</value>
         </field>
         <field var='JID Visibility'>
-            <value>Never Show JID</value>
+            <value>Never</value>
         </field>
      </x>
   </join>
@@ -789,7 +789,7 @@
              <value>urn:xmpp:mix:0</value>
         </field>
         <field var='JID Visibility'>
-            <value>Never Show JID</value>
+            <value>Never</value>
         </field>
         <field var='Private Messages'>
            <value>Allow</value>
@@ -808,29 +808,29 @@
     from='hag66@shakespeare.example'
     to='coven@mix.shakespeare.example'
     id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
-    <get-preference-template xmlns='urn:xmpp:mix:0'/>
+    <user-preference xmlns='urn:xmpp:mix:0'/>
 </iq>
 
 <iq type='result'
     from='coven@mix.shakespeare.example'
     to='hag66@shakespeare.example'
     id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
-    <get-preference-template xmlns='urn:xmpp:mix:0'>
+    <user-preference xmlns='urn:xmpp:mix:0'>
     <x xmlns='jabber:x:data' type='form'>
         <field var='FORM_TYPE' type='hidden'>
              <value>urn:xmpp:mix:0</value>
         </field>
         <field type='list-single' label='Preference for JID Visibility' var='JID Visibility'>
-            <option label='JID Never Shown'><value>Never Show JID</value></option>
-            <option label='Default Behaviour'><value>Use Channel Default</value></option>
-            <option label='Try not to show JID'><value>Prefer Not Show JID</value></option>
+            <option label='JID Never Shown'><value>Never</value></option>
+            <option label='Default Behaviour'><value>Default</value></option>
+            <option label='Try not to show JID'><value>Prefer Not</value></option>
          </field>
          <field type='list-single' label='Example Custom Preference' var='Custom Preference'>
             <option label='One Option'><value>A</value></option>
             <option label='Another Option'><value>B</value></option>
          </field>  
      </x>
-  </get-preference-template>
+  </user-preference>
 </iq>
 ]]></example>