diff --git a/app/changelog/page.mdx b/app/changelog/page.mdx
index 1129138..6476ab8 100644
--- a/app/changelog/page.mdx
+++ b/app/changelog/page.mdx
@@ -30,5 +30,5 @@ This page lists changes since Working Draft 03. {{ className: 'lead' }}
 - Removed the use of `Undo` entities for anything except than deleting entities.
 - Renamed `Undo` to [Delete](/entities/delete).
 - Added [Unfollow](/entities/unfollow) entity.
-- Completely rework [ServerMetadata](/entities/server-metadata).
-- Remove Server Actors, and move instance public keys to [ServerMetadata](/entities/server-metadata).
\ No newline at end of file
+- Completely rework `ServerMetadata`, and rename to [InstanceMetadata](/entities/instance-metadata).
+- Remove Server Actors, and move instance public keys to [InstanceMetadata](/entities/instance-metadata).
\ No newline at end of file
diff --git a/app/entities/server-metadata/page.mdx b/app/entities/instance-metadata/page.mdx
similarity index 98%
rename from app/entities/server-metadata/page.mdx
rename to app/entities/instance-metadata/page.mdx
index 4ce3921..ef2c4f8 100644
--- a/app/entities/server-metadata/page.mdx
+++ b/app/entities/instance-metadata/page.mdx
@@ -101,9 +101,9 @@ On all entities that have an `author` field, the `author` can be `null` to repre
 
     <Col sticky>
 
-    ```jsonc {{ 'title': 'ServerMetadata' }}
+    ```jsonc {{ 'title': 'InstanceMetadata' }}
     {
-        "type": "ServerMetadata",
+        "type": "InstanceMetadata",
         "name": "Jim's Jolly Jimjams",
         "software": {
             "name": "Versia Server",
diff --git a/app/federation/discovery/page.mdx b/app/federation/discovery/page.mdx
index 80bcc1c..dc9441d 100644
--- a/app/federation/discovery/page.mdx
+++ b/app/federation/discovery/page.mdx
@@ -55,7 +55,7 @@ Server metadata can be accessed by making a `GET` request to the server's Versia
 
 To discover the metadata of the server `versia.social`, an instance would make a `GET` request to `https://versia.social/.well-known/versia`.
 
-This endpoint will return a [ServerMetadata](/entities/server-metadata) entity.
+This endpoint will return an [InstanceMetadata](/entities/instance-metadata) entity.
 
 ```http {{ 'title': 'Example Request' }}
 GET /.well-known/versia HTTP/1.1
@@ -64,7 +64,7 @@ Accept: application/json
     
 ```jsonc {{ 'title': 'Example Response' }}
 {
-    "type": "ServerMetadata",
+    "type": "InstanceMetadata",
     "name": "Versia Social",
     "software": {
         "name": "Versia Server",
diff --git a/components/Navigation.tsx b/components/Navigation.tsx
index dd8e860..52c0540 100644
--- a/components/Navigation.tsx
+++ b/components/Navigation.tsx
@@ -277,7 +277,7 @@ export const navigation: NavGroup[] = [
             { title: "FollowAccept", href: "/entities/follow-accept" },
             { title: "FollowReject", href: "/entities/follow-reject" },
             { title: "Notes", href: "/entities/note" },
-            { title: "ServerMetadata", href: "/entities/server-metadata" },
+            { title: "InstanceMetadata", href: "/entities/server-metadata" },
             { title: "Unfollow", href: "/entities/unfollow" },
             { title: "Users", href: "/entities/user" },
         ],