diff --git a/xep-0045.xml b/xep-0045.xml
index b7416f2c..8a4674ca 100644
--- a/xep-0045.xml
+++ b/xep-0045.xml
@@ -2101,13 +2101,13 @@
         <value>http://jabber.org/protocol/muc#register</value>
       </field>
       <field
-          label='First Name'
+          label='Given Name'
           type='text-single'
           var='muc#register_first'>
         <required/>
       </field>
       <field
-          label='Last Name'
+          label='Family Name'
           type='text-single'
           var='muc#register_last'>
         <required/>
@@ -3269,12 +3269,12 @@
     </field>
     <field var='muc#register_first'
            type='text-single'
-           label='First Name'>
+           label='Given Name'>
       <value>Brunhilde</value>
     </field>
     <field var='muc#register_last'
            type="text-single"
-           label="Last Name">
+           label="Family Name">
       <value>Entwhistle-Throckmorton</value>
     </field>
     <field var='muc#register_roomnick'
@@ -4684,11 +4684,11 @@
   <field
       var='muc#register_first'
       type='text-single'
-      label='First Name'/>
+      label='Given Name'/>
   <field
       var='muc#register_last'
       type='text-single'
-      label='Last Name'/>
+      label='Family Name'/>
   <field
       var='muc#register_roomnick'
       type='text-single'
diff --git a/xep-0055.xml b/xep-0055.xml
index 45accb52..7e63608e 100644
--- a/xep-0055.xml
+++ b/xep-0055.xml
@@ -28,25 +28,25 @@
     <version>1.2</version>
     <date>2004-03-22</date>
     <initials>psa</initials>
-    <remark>Clarified scope (searching of any information repository, not just user directories); added search and result examples to the extensibility section.</remark>
+    <remark><p>Clarified scope (searching of any information repository, not just user directories); added search and result examples to the extensibility section.</p></remark>
   </revision>
   <revision>
     <version>1.1</version>
     <date>2004-01-06</date>
     <initials>psa</initials>
-    <remark>Added XML schema; added text regarding extensibility via Data Forms; added FORM_TYPE submission.</remark>
+    <remark><p>Added XML schema; added text regarding extensibility via Data Forms; added FORM_TYPE submission.</p></remark>
   </revision>
   <revision>
     <version>1.0</version>
     <date>2003-01-09</date>
     <initials>psa</initials>
-    <remark>Updated status to Active per vote of the Jabber Council.</remark>
+    <remark><p>Updated status to Active per vote of the Jabber Council.</p></remark>
   </revision>
   <revision>
     <version>0.1</version>
     <date>2002-11-01</date>
     <initials>psa</initials>
-    <remark>Initial version.</remark>
+    <remark><p>Initial version.</p></remark>
   </revision>
 </header>
 <section1 topic='Introduction' anchor='intro'>
@@ -210,8 +210,8 @@
         <value>jabber:iq:search</value>
       </field>
       <reported>
-        <field var='first' label='First Name' type='text-single'/>
-        <field var='last' label='Last Name' type='text-single'/>
+        <field var='first' label='Given Name' type='text-single'/>
+        <field var='last' label='Family Name' type='text-single'/>
         <field var='jid' label='Jabber ID' type='jid-single'/>
         <field var='x-gender' label='Gender' type='list-single'/>
       </reported>
@@ -232,6 +232,23 @@
 </iq>
   ]]></example>
 </section1>
+<section1 topic='Internationalization Considerations' anchor='i18n'>
+  <p>The intent of the &lt;first/&gt; and &lt;last/&gt; elements (and associated data form fields) is that they map to given name and family name, respectively. Therefore, cultures that place the family name first and the given name second (e.g., as is done in China) would use &lt;first/&gt; for the given name and &lt;last/&gt; for the family name, NOT the other way around.</p>
+  <p>For example, the name of the Chinese philosopher Confucius would be rendered as shown below because his given name was Qui and his family name was Kong.</p>
+  <example caption="Internationalization of names"><![CDATA[
+<iq type='submit'
+    from='confucius@scholars.lit/home'
+    to='registrar.scholars.lit'
+    id='kj3b157n'
+    xml:lang='en'>
+  <query xmlns='jabber:iq:register'>
+    <username>confucios</username>
+    <first>Qui</first>
+    <last>Kong</last>
+  </query>
+</iq>
+  ]]></example>
+</section1>
 <section1 topic='Security Considerations' anchor='security'>
   <p>There are no security features or concerns related to this proposal.</p>
 </section1>
@@ -253,7 +270,7 @@
   <field
       var='first'
       type='text-single'
-      label='First Name'/>
+      label='Given Name'/>
   <field
       var='last'
       type='text-single'
diff --git a/xep-0077.xml b/xep-0077.xml
index e597a6bb..eb5a678c 100644
--- a/xep-0077.xml
+++ b/xep-0077.xml
@@ -709,11 +709,11 @@ xmpp:marlowe.shakespeare.lit?unregister
   <field
       var='first'
       type='text-single'
-      label='First name or given name of the user'/>
+      label='Given name of the user'/>
   <field
       var='last'
       type='text-single'
-      label='Last name, surname, or family name of the user'/>
+      label='Family name of the user'/>
   <field
       var='email'
       type='text-single'