diff --git a/inbox/pubsub-account.xml b/inbox/pubsub-account.xml
index eac589fe..605ff5b0 100644
--- a/inbox/pubsub-account.xml
+++ b/inbox/pubsub-account.xml
@@ -6,7 +6,7 @@
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
 <header>
-  <title>Account-Mediated Pubsub</title>
+  <title>Pubsub Account Management</title>
   <abstract>This specification describes a new model for handling remote pubsub services and a protocol for doing so.</abstract>
   &LEGALNOTICE;
   <number>xxxx</number>
@@ -20,7 +20,7 @@
   </dependencies>
   <supersedes/>
   <supersededby/>
-  <shortname>NOT_YET_ASSIGNED</shortname>
+  <shortname>pam</shortname>
   <author>
     <firstname>Dave</firstname>
     <surname>Cridland</surname>
@@ -89,7 +89,7 @@
     <p>Servers receiving +notify from accounts known to support this protocol ignore them.</p>
   </section2>
   <section2 topic='Filtering' anchor='filter'>
-    <p>Clients filter subscriptions using a specific stanza (iq, probably), containing a list of nodes. This can be used instead of the odler +notify (which is broadcast).</p>
+    <p>Clients filter subscriptions using a specific stanza (iq, probably), containing a list of node names. This can be used instead of the odler +notify (which is broadcast).</p>
   </section2>
   <section2 topic='Interaction with MAM' anchor='mam'>
     <p>We probably want to say that events are now archived by MAM, but this may imply that clients need to filter out such events (or explicitly include them). Maybe the mask above affects MAM queries?</p>