diff --git a/changelogs/client_server/newsfragments/2032.clarification b/changelogs/client_server/newsfragments/2032.clarification
new file mode 100644
index 00000000..e10c1a2a
--- /dev/null
+++ b/changelogs/client_server/newsfragments/2032.clarification
@@ -0,0 +1 @@
+Rename Client Config to Account Data for issue #2030
\ No newline at end of file
diff --git a/changelogs/legacy/client_server.rst b/changelogs/legacy/client_server.rst
index 922dd268..ef71bbbc 100644
--- a/changelogs/legacy/client_server.rst
+++ b/changelogs/legacy/client_server.rst
@@ -557,7 +557,7 @@ Since the draft stage, the following major changes have been made:
   - Invites based on third-party identifiers
   - Room tagging
   - Guest access
-  - Account Data
+  - Client config
 - The following APIs were added:
   - ``/sync``
   - ``/publicRooms``
diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md
index 039397fc..09360d5c 100644
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@@ -2927,7 +2927,7 @@ that profile.
 | [Typing Notifications](#typing-notifications)              | Required  | Required | Required | Required | Optional |
 | [User and Room Mentions](#user-and-room-mentions)          | Required  | Required | Required | Optional | Optional |
 | [Voice over IP](#voice-over-ip)                            | Required  | Required | Required | Optional | Optional |
-| [Account Data](#client-config)                            | Optional  | Optional | Optional | Optional | Optional |
+| [Account Data](#account-data)                              | Optional  | Optional | Optional | Optional | Optional |
 | [Device Management](#device-management)                    | Optional  | Optional | Optional | Optional | Optional |
 | [End-to-End Encryption](#end-to-end-encryption)            | Optional  | Optional | Optional | Optional | Optional |
 | [Event Annotations and reactions](#event-annotations-and-reactions) | Optional  | Optional | Optional | Optional | Optional |
diff --git a/data/api/client-server/keys.yaml b/data/api/client-server/keys.yaml
index 695120f3..deafbd15 100644
--- a/data/api/client-server/keys.yaml
+++ b/data/api/client-server/keys.yaml
@@ -15,7 +15,7 @@
 # limitations under the License.
 openapi: 3.1.0
 info:
-  title: Matrix Client-Server Account Data API
+  title: Matrix Client-Server Key Management API
   version: 1.0.0
 paths:
   /keys/upload: