diff --git a/xep-0084.xml b/xep-0084.xml
index c143fd26..3512e285 100644
--- a/xep-0084.xml
+++ b/xep-0084.xml
@@ -122,7 +122,7 @@
     <li>User publishes avatar data for "image/png" content-type to data node and optionally publishes other content-types to HTTP URLs</li>
     <li>User publishes notification of updated avatar to metadata node, with ItemID that matches SHA1 hash of image data for "image/png" content-type (note: this is a hash of the image data itself, not the base64-encoded version)</li>
     <li>Subscribers receive notification</li>
-    <li>Optionally (and if necessary), subscribers retrieve avatar data identified by ItemID from data node using pubsub get-items feature (or via HTTP)</li>
+    <li>Optionally (and if necessary), subscribers retrieve avatar data identified by ItemID from data node using pubsub retrieve-items feature (or via HTTP)</li>
     <li>Optionally, user disables avatar display.</li>
   </ol>
   <p>This process flow is described more fully in the following sections.</p>
@@ -194,7 +194,7 @@
   </section2>
   <section2 topic='Subscribers Retrieve Data' anchor='process-subretrieve'>
     <p>Upon receiving the notification, each subscriber SHOULD determine if it has a locally cached copy of that avatar (which it can determine by searching for an image identified by the ItemID). If the subscriber already has a locally cached copy of the avatar image, it MUST NOT retrieve the image data.</p>
-    <p>If the subscriber does not have a locally cached copy of the avatar image, it SHOULD retrieve the data. It can do this by sending a pubsub get-items request to the data node, specifying the appropriate ItemID:</p>
+    <p>If the subscriber does not have a locally cached copy of the avatar image, it SHOULD retrieve the data. It can do this by sending a pubsub retrieve-items request to the data node, specifying the appropriate ItemID:</p>
     <example caption='Subscriber requests last item by ItemID'><![CDATA[
 <iq type='get'
     from='romeo@montague.net/home'
@@ -442,7 +442,7 @@
     <p>If a user has multiple online resources at the same time, each resource MAY publish a different avatar. The PEP service SHOULD include the replyto address of the publishing resource as shown above in order to facilitate differentiation between per-resource avatars.</p>
   </section2>
   <section2 topic='Avatar Synchronization' anchor='impl-sync'>
-    <p>When a user logs in with a new resource and before publishing an avatar, its client SHOULD retrieve its last published avatar, either automatically by sending presence with the appropriate &xep0115; information or using the "get-items" method described in <cite>XEP-0060</cite>.</p>
+    <p>When a user logs in with a new resource and before publishing an avatar, its client SHOULD retrieve its last published avatar, either automatically by sending presence with the appropriate &xep0115; information or using the "retrieve-items" method described in <cite>XEP-0060</cite>.</p>
   </section2>
   <section2 topic='Image Handling' anchor='impl-images'>
     <p>It is the responsibility of the receiving application to determine which avatar format to retrieve (e.g., "image/gif" rather than "image/png") and to determine the appropriate method for retrieval (e.g., HTTP rather than pubsub).</p>