diff --git a/xep-0115.xml b/xep-0115.xml
index ade8d8b4..e5baac0d 100644
--- a/xep-0115.xml
+++ b/xep-0115.xml
@@ -124,7 +124,7 @@
 </presence>
       ]]></code>
       <p>The 'node' attribute represents the client Romeo is using. The 'ver' attribute is a specially-constructed string that represents the identity (see &DISCOCATEGORIES;) and supported features (see &DISCOFEATURES;) of the entity.</p>
-      <p>At this point, your client has no idea what the capabilities are of someone with a client string 'http://exodus.jabberstudio.org/caps' and a version string '8RovUdtOmiAjzj+xI7SK5BCw3A8='. Your client therefore sends a service discovery query to Romeo, asking what his client can do (note that the disco#info query is sent to a node of "node#ver"):</p>
+      <p>At this point, your client has no idea what the capabilities are of someone with a client string 'http://exodus.jabberstudio.org/caps' and a version string '8RovUdtOmiAjzj+xI7SK5BCw3A8='. Your client therefore sends a service discovery query to Romeo, asking what his client can do.</p>
       <code><![CDATA[
 <iq type='get' from='juliet@capulet.lit/chamber' to='romeo@montague.lit/home' id='disco1'>
   <query xmlns='http://jabber.org/protocol/disco#info'
@@ -147,7 +147,7 @@
       <code><![CDATA[
 <presence from='benvolio@capulet.lit/230193'>
   <c xmlns='http://jabber.org/protocol/caps' 
-     node='http://exodus.jabberstudio.org/caps'
+     node='http://psi-im.org/caps'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></code>
@@ -245,7 +245,7 @@
       <li>Only one identity: client/pc</li>
       <li>E = 'client/pc&lt;'</li>
       <li>Sort the features: "http://jabber.org/protocol/disco#info", "http://jabber.org/protocol/disco#items", "http://jabber.org/protocol/muc".</li>
-      <li>E = 'client/pc&lt;http://jabber.org/protocol/disco#info&lt;http://jabber.org/protocol/disco#items&lt;&lt;http://jabber.org/protocol/muc&lt;'</li>
+      <li>E = 'client/pc&lt;http://jabber.org/protocol/disco#info&lt;http://jabber.org/protocol/disco#items&lt;http://jabber.org/protocol/muc&lt;'</li>
       <li>ver = 8RovUdtOmiAjzj+xI7SK5BCw3A8=</li>
     </ol>
   </section1>