diff --git a/xep-0384.xml b/xep-0384.xml
index d593aace..bff0202e 100644
--- a/xep-0384.xml
+++ b/xep-0384.xml
@@ -309,7 +309,7 @@
     </p>
   </section2>
   <section2 topic='Discovering peer support' anchor='usecases-discovering'>
-    <p>In order to determine whether a given contact has devices that support OMEMO, the devicelist node in PEP is consulted. Devices MUST subscribe to 'urn:xmpp:omemo:1:devices' via PEP, so that they are informed whenever their contacts add a new device. They MUST cache the most up-to-date version of the devicelist.</p>
+    <p>In order to determine whether a given contact has devices that support OMEMO, the devices node in PEP is consulted. Devices MUST subscribe to 'urn:xmpp:omemo:1:devices' via PEP, so that they are informed whenever their contacts add a new device. They MUST cache the most up-to-date version of the device list.</p>
     <example caption='Devicelist update received by subscribed clients'><![CDATA[
 <message from='juliet@capulet.lit'
          to='romeo@montague.lit'
@@ -329,10 +329,10 @@
   </section2>
   <section2 topic='Announcing support' anchor='usecases-announcing'>
     <section3 topic='Device list' anchor='devices'>
-    <p>In order for other devices to be able to initiate a session with a given device, it first has to announce itself by adding its device id to the devicelist PEP node. </p>
+    <p>In order for other devices to be able to initiate a session with a given device, it first has to announce itself by adding its device id to the devices PEP node. </p>
     <p>It is RECOMMENDED to set the access model of the ‘urn:xmpp:omemo:1:devices’ node to ‘open’ to give entities without presence subscription read access to the devices and allow them to establish an OMEMO session. Not having presence subscription is a common occurrence on the first few messages between two contacts and can also happen fairly frequently in group chats as not every participant had prior communication with every other participant.</p>
     <p>The access model can be changed efficiently by using publish-options.</p>
-    <p>The device element MAY contain an attribute called label, which is a user defined string describing the device that published that bundle. It is RECOMMENDED to keep the length of the label under 53 characters.</p>
+    <p>The device element MAY contain an attribute called label, which is a user defined string describing the device that published that bundle. It is RECOMMENDED to keep the length of the label under 53 Unicode code points.</p>
     <example caption='Adding the own device id to the list'><![CDATA[
 <iq from='juliet@capulet.lit' type='set' id='announce1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>