diff --git a/xep-0048.xml b/xep-0048.xml
index 9d3f667e..05afe6ec 100644
--- a/xep-0048.xml
+++ b/xep-0048.xml
@@ -6,7 +6,7 @@
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
 <header>
-  <title>Bookmark Storage</title>
+  <title>Bookmarks</title>
   <abstract>This document defines an XML data format for storing bookmarks to XMPP conference rooms and HTTP URLs.</abstract>
   &LEGALNOTICE;
   <number>0048</number>
@@ -33,8 +33,8 @@
   &pgmillard;
   &stpeter;
   <revision>
-    <version>1.1pre1</version>
-    <date>in progress, last updated 2007-09-12</date>
+    <version>1.1pre2</version>
+    <date>in progress, last updated 2007-09-24</date>
     <initials>psa</initials>
     <remark><p>Specified use of PEP as a storage mechanism in addition to existing jabber:iq:private method.</p></remark>
   </revision>
@@ -108,7 +108,7 @@
 <iq from='juliet@capulet.lit/balcony' type='set' id='pip1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='storage:bookmarks'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:bookmarks'>
           <conference name='The Play&apos;s the Thing' 
                       autojoin='true'
@@ -148,7 +148,7 @@
          id='rnfoo1'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='storage:bookmarks'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:bookmarks'>
           <conference name='The Play&apos;s the Thing' 
                       autojoin='true'
@@ -168,7 +168,7 @@
          id='rnfoo2'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='storage:bookmarks'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:bookmarks'>
         <note jid='hamlet@shakespeare.lit'
               cdate='2004-09-24T15:23:21Z'
@@ -198,7 +198,7 @@
     id='retrieve1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <items node='storage:bookmarks'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:bookmarks'>
           <conference name='The Play&apos;s the Thing' 
                       autojoin='true'
diff --git a/xep-0145.xml b/xep-0145.xml
index b1a758dc..fa803772 100644
--- a/xep-0145.xml
+++ b/xep-0145.xml
@@ -32,8 +32,8 @@
   </author>
   &stpeter;
   <revision>
-    <version>1.1pre1</version>
-    <date>in progress, last updated 2007-09-12</date>
+    <version>1.1pre2</version>
+    <date>in progress, last updated 2007-09-24</date>
     <initials>psa</initials>
     <remark><p>Specified use of PEP as a storage mechanism in addition to existing jabber:iq:private method.</p></remark>
   </revision>
@@ -86,7 +86,7 @@
 <iq from='juliet@capulet.lit/balcony' type='set' id='pip1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <publish node='storage:rosternotes'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:rosternotes'>
         <note jid='hamlet@shakespeare.lit'
               cdate='2004-09-24T15:23:21Z'
@@ -126,7 +126,7 @@
          id='rnfoo1'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='storage:rosternotes'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:rosternotes'>
         <note jid='hamlet@shakespeare.lit'
               cdate='2004-09-24T15:23:21Z'
@@ -146,7 +146,7 @@
          id='rnfoo2'>
   <event xmlns='http://jabber.org/protocol/pubsub#event'>
     <items node='storage:rosternotes'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:rosternotes'>
         <note jid='hamlet@shakespeare.lit'
               cdate='2004-09-24T15:23:21Z'
@@ -176,7 +176,7 @@
     id='retrieve1'>
   <pubsub xmlns='http://jabber.org/protocol/pubsub'>
     <items node='storage:rosternotes'>
-      <item id='SINGLETON'>
+      <item id='current'>
         <storage xmlns='storage:rosternotes'>
           <note jid='hamlet@shakespeare.lit'
                 cdate='2004-09-24T15:23:21Z'