diff --git a/xep-0230.xml b/xep-0230.xml
index 451e5927..480326d4 100644
--- a/xep-0230.xml
+++ b/xep-0230.xml
@@ -73,16 +73,16 @@
     to='bill@shakespeare.lit/globe'
     id='items1'>
   <query xmlns='http://jabber.org/protocol/disco#items'>
-    <item jid='alls-well-that-ends-well@rooms.shakespeare.lit'/>
-    <item jid='as-you-like-it@rooms.shakespeare.lit'/>
-    <item jid='cleopatra@rooms.shakespeare.lit'/>
-    <item jid='comedy-of-errors@rooms.shakespeare.lit'/>
-    <item jid='coriolanus@rooms.shakespeare.lit'/>
-    <item jid='cymbeline@rooms.shakespeare.lit'/>
-    <item jid='hamlet@rooms.shakespeare.lit'/>
-    <item jid='henry-the-fourth-one@rooms.shakespeare.lit'/>
-    <item jid='henry-the-fourth-two@rooms.shakespeare.lit'/>
-    <item jid='henry-the-fifth@rooms.shakespeare.lit'/>
+    <item jid='alls-well-that-ends-well@chat.shakespeare.lit'/>
+    <item jid='as-you-like-it@chat.shakespeare.lit'/>
+    <item jid='cleopatra@chat.shakespeare.lit'/>
+    <item jid='comedy-of-errors@chat.shakespeare.lit'/>
+    <item jid='coriolanus@chat.shakespeare.lit'/>
+    <item jid='cymbeline@chat.shakespeare.lit'/>
+    <item jid='hamlet@chat.shakespeare.lit'/>
+    <item jid='henry-the-fourth-one@chat.shakespeare.lit'/>
+    <item jid='henry-the-fourth-two@chat.shakespeare.lit'/>
+    <item jid='henry-the-fifth@chat.shakespeare.lit'/>
     <subscription
         jid='bill@shakespeare.lit'
         subid='some-long-sub-id'
@@ -97,7 +97,7 @@
     <items node='http://jabber.org/protocol/disco#items'/>
       <item id='ae890ac52d0df67ed7cfdf51b644e901'>
         <item xmlns='http://jabber.org/protocol/disco#items'
-              jid='henry-the-fifth@rooms.shakespeare.lit'/>
+              jid='henry-the-fifth@chat.shakespeare.lit'/>
       </item>
     </items>
   </event>
@@ -109,8 +109,8 @@
     <items node='http://jabber.org/protocol/disco#items'/>
       <retract id='fa890ca52d0df67de7fcfd51b644c701'>
         <item xmlns='http://jabber.org/protocol/disco#items'
-              jid='cardenio@rooms.shakespeare.lit'/>
-      </item>
+              jid='cardenio@chat.shakespeare.lit'/>
+      </retract>
     </items>
   </event>
 </message>