diff --git a/xep-0459.xml b/xep-0459.xml
index 9133fd43..de6b937e 100644
--- a/xep-0459.xml
+++ b/xep-0459.xml
@@ -121,9 +121,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 +145,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 +170,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 +242,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 +274,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 +445,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 +491,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>