diff --git a/xep-0136.xml b/xep-0136.xml
index ea2adf72..c83deeb2 100644
--- a/xep-0136.xml
+++ b/xep-0136.xml
@@ -675,7 +675,7 @@
     <example caption='Private chat linked to later groupchat'><![CDATA[
 <iq type='set' id='link1'>
   <save xmlns='urn:xmpp:tmp:archive'>
-    <chat with='benvolio@capulet.com'
+    <chat with='benvolio@montague.net'
           start='1469-07-21T03:01:54Z'>
       <next with='balcony@house.capulet.com' start='1469-07-21T03:16:37Z'/>
       <to secs='0'><body>O, I am fortune's fool!</body></to>
@@ -689,7 +689,7 @@
   <save xmlns='urn:xmpp:tmp:archive'>
     <chat with='balcony@house.capulet.com'
           start='1469-07-21T03:16:37Z'>
-      <previous with='benvolio@capulet.com' start='1469-07-21T03:01:54Z'/>
+      <previous with='benvolio@montague.net' start='1469-07-21T03:01:54Z'/>
       <from secs='0' name='benvolio'><body>She will invite him to some supper.</body></from>
       <from secs='6' name='mercutio'><body>A bawd, a bawd, a bawd! So ho!</body></from>
       <from secs='3' name='romeo'><body>What hast thou found?</body></from>
@@ -719,7 +719,7 @@
     <example caption='Private chat with attributes form'><![CDATA[
 <iq type='set' id='form1'>
   <save xmlns='urn:xmpp:tmp:archive'>
-    <chat with='benvolio@capulet.com'
+    <chat with='benvolio@montague.net'
           start='1469-07-21T03:01:54Z'>
       <to secs='0'><body>O, I am fortune's fool!</body></to>
       <from secs='4'><body>Why dost thou stay?</body></from>
@@ -1117,7 +1117,7 @@
     <example caption='Private chat with encrypted attributes form'><![CDATA[
 <iq type='set' id='form2'>
   <save xmlns='urn:xmpp:tmp:archive'>
-    <chat with='benvolio@capulet.com'
+    <chat with='benvolio@montague.net'
           start='1469-07-21T03:01:54Z'>
       <x xmlns='jabber:x:data' type='submit'>
         <EncryptedData xmlns='http://www.w3.org/2001/04/xmlenc#'
@@ -1145,7 +1145,7 @@
     <example caption='Deleting the attributes form'><![CDATA[
 <iq type='set' id='form3'>
   <save xmlns='urn:xmpp:tmp:archive'>
-    <chat with='benvolio@capulet.com'
+    <chat with='benvolio@montague.net'
           start='1469-07-21T03:01:54Z'>
       <x xmlns='jabber:x:data' type='submit'/>
     </chat>
diff --git a/xep-0189.xml b/xep-0189.xml
index c9740c61..49464af8 100644
--- a/xep-0189.xml
+++ b/xep-0189.xml
@@ -411,7 +411,7 @@
     id='keys3'
     to='juliet@capulet.com/balcony'
     from='romeo@montague.net/garden'>
-  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@capulet.com'/>
+  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@montague.net'/>
 </iq>
   ]]></example>
   <example caption='Third-party responds with public keys'><![CDATA[
@@ -419,7 +419,7 @@
     id='keys3'
     to='romeo@montague.net/garden'
     from='juliet@capulet.com/balcony'>
-  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@capulet.com'>
+  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@montague.net'>
     <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
       ...
     </KeyInfo>
@@ -434,7 +434,7 @@
     id='keys3'
     to='romeo@montague.net/garden'
     from='juliet@capulet.com/balcony'>
-  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@capulet.com'/>
+  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@montague.net'/>
   <error code='404' type='cancel'>
     <item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
   </error>
@@ -447,7 +447,7 @@
   <example caption='Sending public keys'><![CDATA[
 <message to='romeo@montague.net/garden'
          from='juliet@capulet.com/balcony'>
-  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@capulet.com'>
+  <pubkeys xmlns='urn:xmpp:tmp:pubkey' jid='benvolio@montague.net'>
     <KeyInfo xmlns='http://www.w3.org/2000/09/xmldsig#'>
       <KeyValue>
         <RSAKeyValue>
