diff --git a/xep-0090.xml b/xep-0090.xml
index ee8de70d..8223a5b8 100644
--- a/xep-0090.xml
+++ b/xep-0090.xml
@@ -6,8 +6,8 @@
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
 <header>
-  <title>Entity Time</title>
-  <abstract>This specification provides historical documentation of the jabber:iq:time namespace, which has been deprecated in favor the urn:xmpp:time namespace defined in XEP-0202.</abstract>
+  <title>Legacy Entity Time</title>
+  <abstract>This specification provides historical documentation of the legacy jabber:iq:time namespace, which has been deprecated in favor the urn:xmpp:time namespace defined in XEP-0202.</abstract>
   &LEGALNOTICE;
   <number>0090</number>
   <status>Obsolete</status>
diff --git a/xep-0091.xml b/xep-0091.xml
index 7cae25c8..59cb1ace 100644
--- a/xep-0091.xml
+++ b/xep-0091.xml
@@ -6,8 +6,8 @@
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
 <header>
-  <title>Delayed Delivery</title>
-  <abstract>This specification provides historical documentation of the jabber:x:delay namespace, which has been deprecated in favor the urn:xmpp:delay namespace defined in XEP-0203.</abstract>
+  <title>Legacy Delayed Delivery</title>
+  <abstract>This specification provides historical documentation of the legacy jabber:x:delay namespace, which has been deprecated in favor the urn:xmpp:delay namespace defined in XEP-0203.</abstract>
   &LEGALNOTICE;
   <number>0091</number>
   <status>Obsolete</status>
diff --git a/xep.ent b/xep.ent
index f8cbd125..e2a2e29e 100644
--- a/xep.ent
+++ b/xep.ent
@@ -924,8 +924,8 @@ IANA Service Location Protocol, Version 2 (SLPv2) Templates</link></span> <note>
 <!ENTITY xep0087 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0087.html'>Stream Initiation</link></span> <note>XEP-0087: Stream Initiation &lt;<link url='http://xmpp.org/extensions/xep-0087.html'>http://xmpp.org/extensions/xep-0087.html</link>&gt;.</note>" >
 <!ENTITY xep0088 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0088.html'>Client Webtabs</link></span> <note>XEP-0088: Client Webtabs &lt;<link url='http://xmpp.org/extensions/xep-0088.html'>http://xmpp.org/extensions/xep-0088.html</link>&gt;.</note>" >
 <!ENTITY xep0089 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0089.html'>Generic Alerts</link></span> <note>XEP-0089: Generic Alerts &lt;<link url='http://xmpp.org/extensions/xep-0089.html'>http://xmpp.org/extensions/xep-0089.html</link>&gt;.</note>" >
-<!ENTITY xep0090 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0090.html'>Entity Time</link></span> <note>XEP-0090: Entity Time &lt;<link url='http://xmpp.org/extensions/xep-0090.html'>http://xmpp.org/extensions/xep-0090.html</link>&gt;.</note>" >
-<!ENTITY xep0091 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0091.html'>Delayed Delivery</link></span> <note>XEP-0091: Delayed Delivery &lt;<link url='http://xmpp.org/extensions/xep-0091.html'>http://xmpp.org/extensions/xep-0091.html</link>&gt;.</note>" >
+<!ENTITY xep0090 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0090.html'>Legacy Entity Time</link></span> <note>XEP-0090: Legacy Entity Time &lt;<link url='http://xmpp.org/extensions/xep-0090.html'>http://xmpp.org/extensions/xep-0090.html</link>&gt;.</note>" >
+<!ENTITY xep0091 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0091.html'>Legacy Delayed Delivery</link></span> <note>XEP-0091: Legacy Delayed Delivery &lt;<link url='http://xmpp.org/extensions/xep-0091.html'>http://xmpp.org/extensions/xep-0091.html</link>&gt;.</note>" >
 <!ENTITY xep0092 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0092.html'>Software Version</link></span> <note>XEP-0092: Software Version &lt;<link url='http://xmpp.org/extensions/xep-0092.html'>http://xmpp.org/extensions/xep-0092.html</link>&gt;.</note>" >
 <!ENTITY xep0093 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0093.html'>Roster Item Exchange</link></span> <note>XEP-0093: Roster Item Exchange &lt;<link url='http://xmpp.org/extensions/xep-0093.html'>http://xmpp.org/extensions/xep-0093.html</link>&gt;.</note>" >
 <!ENTITY xep0094 "<span class='ref'><link url='http://xmpp.org/extensions/xep-0094.html'>Agent Information</link></span> <note>XEP-0094: Agent Information &lt;<link url='http://xmpp.org/extensions/xep-0094.html'>http://xmpp.org/extensions/xep-0094.html</link>&gt;.</note>" >