diff --git a/xep-0459.xml b/xep-0459.xml
index 9133fd43..a09ba134 100644
--- a/xep-0459.xml
+++ b/xep-0459.xml
@@ -63,6 +63,17 @@
       <email>sonny@fastmail.net</email>
       <jid>sonny@jabberfr.org</jid>
     </author>
+  <revision>
+    <version>0.2.0</version>
+    <date>2021-10-27</date>
+    <initials>sp</initials>
+    <remark>
+      <ul>
+        <li>Rename Advanced Server and Advanced Client to Server and Client</li>
+        <li>Add XEP-0455 to Future Development section</li>
+      </ul> 
+    </remark>
+  </revision>
   <revision>
     <version>0.1.1</version>
     <date>2021-10-06</date>
@@ -121,9 +132,10 @@
     <section2 topic='Changes since 2021' anchor='changes-2021'>
       <p>The following changes were made to the Compliance Suites since &xep0443;:</p>
       <ul>
+        <li>Renamed "Core Client" and "Core Server" to "Client" and "Server"</li>
         <li>Web category:
           <ul>
-            <li>Core Client: required Connection Mechanism Discovery.</li>
+            <li>Client: required Connection Mechanism Discovery.</li>
           </ul>
         </li>
       </ul>
@@ -144,8 +156,8 @@
       <ul>
 	<li>IM Category:
 	  <ul>
-	    <li>Core Client: added &xep0245;</li>
-	    <li>Core Client and Server: added &xep0363;</li>
+	    <li>Client: added &xep0245;</li>
+	    <li>Client and Server: added &xep0363;</li>
 	    <li>Advanced Client: added &xep0234;, &xep0261;</li>
 	    <li>Advanced Client and Server: added &xep0411;</li>
 	    <li>Specifications of note: added &xep0077; and &xep0157;, &xep0392;, &xep0066; and &xep0385;</li>
@@ -169,8 +181,8 @@
       <table caption='XMPP Core Compliance Levels'>
         <tr>
           <th>Feature</th>
-          <th>Core Server</th>
-          <th>Core Client</th>
+          <th>Server</th>
+          <th>Client</th>
           <th>Advanced Server</th>
           <th>Advanced Client</th>
           <th>Providers</th>
@@ -241,8 +253,8 @@
       <table caption='XMPP Web Compliance Levels'>
         <tr>
           <th>Feature</th>
-          <th>Core Server</th>
-          <th>Core Client</th>
+          <th>Server</th>
+          <th>Client</th>
           <th>Advanced Server</th>
           <th>Advanced Client</th>
           <th>Providers</th>
@@ -273,8 +285,8 @@
       <table caption='XMPP IM Compliance Levels'>
         <tr>
           <th>Feature</th>
-          <th>Core Server</th>
-          <th>Core Client</th>
+          <th>Server</th>
+          <th>Client</th>
           <th>Advanced Server</th>
           <th>Advanced Client</th>
           <th>Providers</th>
@@ -444,8 +456,8 @@
       <table caption='XMPP Mobile Compliance Levels'>
         <tr>
           <th>Feature</th>
-          <th>Core Server</th>
-          <th>Core Client</th>
+          <th>Server</th>
+          <th>Client</th>
           <th>Advanced Server</th>
           <th>Advanced Client</th>
           <th>Providers</th>
@@ -490,8 +502,8 @@
       <table caption='A/V Calling Compliance Levels'>
         <tr>
           <th>Feature</th>
-          <th>Core Server</th>
-          <th>Core Client</th>
+          <th>Server</th>
+          <th>Client</th>
           <th>Advanced Server</th>
           <th>Advanced Client</th>
           <th>Providers</th>
@@ -547,23 +559,24 @@
     <ul>
       <li>Client connection optimizations: &xep0386; and &xep0409;, maybe also &xep0397;</li>
       <li>Improved on-boarding of new users:
-	<ul>
-	  <li>&xep0401; to create account invitations</li>
-	  <li>&xep0379; for contact invitations</li>
-	  <li>&xep0445; to register accounts based on an invitation</li>
-	</ul>
+	      <ul>
+	        <li>&xep0401; to create account invitations</li>
+	        <li>&xep0379; for contact invitations</li>
+	        <li>&xep0445; to register accounts based on an invitation</li>
+	      </ul>
       </li>
       <li>&xep0333;</li>
       <li>&xep0369;</li>
       <li>End-to-End Encryption (E2EE): &xep0380; for tagging encrypted messages, &xep0420; to protect all payloads; and also one or multiple of the following for actual encryption:
-	<ul>
-	  <li>&xep0384; and &xep0396;</li>
-	  <li>&xep0374;</li>
-	</ul>
+        <ul>
+          <li>&xep0384; and &xep0396;</li>
+          <li>&xep0374;</li>
+        </ul>
       </li>
       <li>&xep0402; to phase out &xep0048;, &xep0049;, and &xep0411;</li>
       <li>&xep0225; to phase out &xep0114;</li>
       <li>&xep0390; to phase out &xep0115;</li>
+      <li>&xep0455;</li>
     </ul>
   </section1>
   <section1 topic='Implementation Notes' anchor='impl'>