diff --git a/bun.lockb b/bun.lockb
index 6ac1ef25..86f17ef6 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/classes/functions/application.ts b/classes/functions/application.ts
index 1b8d1a7e..c4f82de5 100644
--- a/classes/functions/application.ts
+++ b/classes/functions/application.ts
@@ -1,4 +1,4 @@
-import type { Application as APIApplication } from "@lysand-org/client/types";
+import type { Application as APIApplication } from "@versia/client/types";
 import type { InferSelectModel } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import type { Applications } from "~/drizzle/schema";
diff --git a/classes/functions/notification.ts b/classes/functions/notification.ts
index 9b880de8..cb7794dd 100644
--- a/classes/functions/notification.ts
+++ b/classes/functions/notification.ts
@@ -1,4 +1,4 @@
-import type { Notification as ApiNotification } from "@lysand-org/client/types";
+import type { Notification as ApiNotification } from "@versia/client/types";
 import type { InferSelectModel } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import type { Notifications } from "~/drizzle/schema";
diff --git a/config/config.example.toml b/config/config.example.toml
index 1fc34e42..03b384d4 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -323,8 +323,8 @@ avatars = []
 # Bridges must be hosted separately from the main Versia Server process
 [federation.bridge]
 enabled = false
-# Only lysand-ap exists for now
-software = "lysand-ap"
+# Only versia-ap exists for now
+software = "versia-ap"
 # If this is empty, any bridge with the correct token
 # will be able to send data to your instance
 allowed_ips = ["192.168.1.0/24"]
diff --git a/config/config.schema.json b/config/config.schema.json
index 2f094f18..089510ef 100644
--- a/config/config.schema.json
+++ b/config/config.schema.json
@@ -3346,7 +3346,7 @@
                             "anyOf": [
                                 {
                                     "type": "string",
-                                    "enum": ["lysand-ap"]
+                                    "enum": ["versia-ap"]
                                 },
                                 {
                                     "type": "string"
@@ -3372,7 +3372,7 @@
                     "additionalProperties": false,
                     "default": {
                         "enabled": false,
-                        "software": "lysand-ap",
+                        "software": "versia-ap",
                         "allowed_ips": [],
                         "token": ""
                     }
@@ -3396,7 +3396,7 @@
                 },
                 "bridge": {
                     "enabled": false,
-                    "software": "lysand-ap",
+                    "software": "versia-ap",
                     "allowed_ips": [],
                     "token": ""
                 }
diff --git a/docs/glitch-soc.md b/docs/glitch-soc.md
index 0b0eeb7f..6b277aa5 100644
--- a/docs/glitch-soc.md
+++ b/docs/glitch-soc.md
@@ -7,7 +7,7 @@ Versia Server supports the use of the Glitch-Soc fork of Mastodon's frontend. He
 3. Change the config to enable Glitch-FE:
     ```toml
     [frontend]
-    # Enable custom frontends (warning: not enabling this or Glitch will make Lysand only accessible via the Mastodon API)
+    # Enable custom frontends (warning: not enabling this or Glitch will make Versia Server only accessible via the Mastodon API)
     # Frontends also control the OAuth flow, so if you disable this, you will need to use the Mastodon frontend
     enabled = true
     # The URL to reach the frontend at (should be on a local network)
diff --git a/drizzle/schema.ts b/drizzle/schema.ts
index 73c81a67..f8d87947 100644
--- a/drizzle/schema.ts
+++ b/drizzle/schema.ts
@@ -1,4 +1,4 @@
-import type { Source as ApiSource } from "@lysand-org/client/types";
+import type { Source as ApiSource } from "@versia/client/types";
 import type { ContentFormat } from "@versia/federation/types";
 import type { Challenge } from "altcha-lib/types";
 import { relations, sql } from "drizzle-orm";
diff --git a/package.json b/package.json
index d9a7170d..6888fd7c 100644
--- a/package.json
+++ b/package.json
@@ -105,10 +105,10 @@
         "@inquirer/input": "^2.2.9",
         "@json2csv/plainjs": "^7.0.6",
         "@logtape/logtape": "npm:@jsr/logtape__logtape@0.4.2",
-        "@lysand-org/client": "^0.2.5",
         "@oclif/core": "^4.0.19",
         "@sentry/bun": "^8.26.0",
         "@tufjs/canonical-json": "^2.0.0",
+        "@versia/client": "^0.1.0-rc.0",
         "@versia/federation": "^0.1.0-rc.1",
         "altcha-lib": "^0.5.1",
         "blurhash": "^2.0.5",
diff --git a/packages/config-manager/config.type.ts b/packages/config-manager/config.type.ts
index 005bcced..b1638684 100644
--- a/packages/config-manager/config.type.ts
+++ b/packages/config-manager/config.type.ts
@@ -484,14 +484,14 @@ export const configValidator = z.object({
             bridge: z
                 .object({
                     enabled: z.boolean().default(false),
-                    software: z.enum(["lysand-ap"]).or(z.string()),
+                    software: z.enum(["versia-ap"]).or(z.string()),
                     allowed_ips: z.array(z.string().trim()).default([]),
                     token: z.string().default(""),
                     url: zUrl.optional(),
                 })
                 .default({
                     enabled: false,
-                    software: "lysand-ap",
+                    software: "versia-ap",
                     allowed_ips: [],
                     token: "",
                 })
@@ -516,7 +516,7 @@ export const configValidator = z.object({
             },
             bridge: {
                 enabled: false,
-                software: "lysand-ap",
+                software: "versia-ap",
                 allowed_ips: [],
                 token: "",
             },
diff --git a/packages/database-interface/attachment.ts b/packages/database-interface/attachment.ts
index b0d0d00c..4c53f047 100644
--- a/packages/database-interface/attachment.ts
+++ b/packages/database-interface/attachment.ts
@@ -2,7 +2,7 @@ import { proxyUrl } from "@/response";
 import type {
     AsyncAttachment as ApiAsyncAttachment,
     Attachment as ApiAttachment,
-} from "@lysand-org/client/types";
+} from "@versia/client/types";
 import type { ContentFormat } from "@versia/federation/types";
 import {
     type InferInsertModel,
diff --git a/packages/database-interface/emoji.ts b/packages/database-interface/emoji.ts
index 5324679b..fe7f5786 100644
--- a/packages/database-interface/emoji.ts
+++ b/packages/database-interface/emoji.ts
@@ -1,6 +1,6 @@
 import { emojiValidatorWithColons, emojiValidatorWithIdentifiers } from "@/api";
 import { proxyUrl } from "@/response";
-import type { Emoji as ApiEmoji } from "@lysand-org/client/types";
+import type { Emoji as ApiEmoji } from "@versia/client/types";
 import type { CustomEmojiExtension } from "@versia/federation/types";
 import {
     type InferInsertModel,
diff --git a/packages/database-interface/note.ts b/packages/database-interface/note.ts
index 1feb7ee8..110fd597 100644
--- a/packages/database-interface/note.ts
+++ b/packages/database-interface/note.ts
@@ -7,7 +7,7 @@ import { getLogger } from "@logtape/logtape";
 import type {
     Attachment as ApiAttachment,
     Status as ApiStatus,
-} from "@lysand-org/client/types";
+} from "@versia/client/types";
 import { EntityValidator } from "@versia/federation";
 import type {
     ContentFormat,
diff --git a/packages/database-interface/relationship.ts b/packages/database-interface/relationship.ts
index 959242d0..6ec151c0 100644
--- a/packages/database-interface/relationship.ts
+++ b/packages/database-interface/relationship.ts
@@ -1,4 +1,4 @@
-import type { Relationship as APIRelationship } from "@lysand-org/client/types";
+import type { Relationship as APIRelationship } from "@versia/client/types";
 import {
     type InferInsertModel,
     type InferSelectModel,
diff --git a/packages/database-interface/role.ts b/packages/database-interface/role.ts
index c2ae2fbc..051de943 100644
--- a/packages/database-interface/role.ts
+++ b/packages/database-interface/role.ts
@@ -1,5 +1,5 @@
 import { proxyUrl } from "@/response";
-import type { RolePermission } from "@lysand-org/client/types";
+import type { RolePermission } from "@versia/client/types";
 import {
     type InferInsertModel,
     type InferSelectModel,
diff --git a/packages/database-interface/user.ts b/packages/database-interface/user.ts
index 7210a73a..c81f25d9 100644
--- a/packages/database-interface/user.ts
+++ b/packages/database-interface/user.ts
@@ -7,14 +7,14 @@ import { getLogger } from "@logtape/logtape";
 import type {
     Account as ApiAccount,
     Mention as ApiMention,
-} from "@lysand-org/client/types";
+} from "@versia/client/types";
 import {
     EntityValidator,
     FederationRequester,
     type HttpVerb,
     SignatureConstructor,
 } from "@versia/federation";
-import type { User as VersiaUser } from "@versia/federation/types";
+import type { Collection, User as VersiaUser } from "@versia/federation/types";
 import chalk from "chalk";
 import {
     type InferInsertModel,
@@ -668,7 +668,7 @@ export class User extends BaseInterface<typeof Users, UserWithRelations> {
      * @returns The signed string and headers to send with the request
      */
     async sign(
-        entity: KnownEntity,
+        entity: KnownEntity | Collection,
         signatureUrl: string | URL,
         signatureMethod: HttpVerb = "POST",
     ): Promise<{
diff --git a/server/api/api/v1/accounts/:id/block.test.ts b/server/api/api/v1/accounts/:id/block.test.ts
index c1aa83ad..23441b59 100644
--- a/server/api/api/v1/accounts/:id/block.test.ts
+++ b/server/api/api/v1/accounts/:id/block.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
+import type { Relationship as ApiRelationship } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./block";
diff --git a/server/api/api/v1/accounts/:id/follow.test.ts b/server/api/api/v1/accounts/:id/follow.test.ts
index 5a82373c..f29c6332 100644
--- a/server/api/api/v1/accounts/:id/follow.test.ts
+++ b/server/api/api/v1/accounts/:id/follow.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
+import type { Relationship as ApiRelationship } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./follow";
diff --git a/server/api/api/v1/accounts/:id/followers.test.ts b/server/api/api/v1/accounts/:id/followers.test.ts
index 513a8ea6..79884129 100644
--- a/server/api/api/v1/accounts/:id/followers.test.ts
+++ b/server/api/api/v1/accounts/:id/followers.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./followers";
diff --git a/server/api/api/v1/accounts/:id/following.test.ts b/server/api/api/v1/accounts/:id/following.test.ts
index 58f13b32..504621f8 100644
--- a/server/api/api/v1/accounts/:id/following.test.ts
+++ b/server/api/api/v1/accounts/:id/following.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./following";
diff --git a/server/api/api/v1/accounts/:id/index.test.ts b/server/api/api/v1/accounts/:id/index.test.ts
index 8da0c320..c7983ac8 100644
--- a/server/api/api/v1/accounts/:id/index.test.ts
+++ b/server/api/api/v1/accounts/:id/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/accounts/:id/mute.test.ts b/server/api/api/v1/accounts/:id/mute.test.ts
index a75da007..cc9edcdd 100644
--- a/server/api/api/v1/accounts/:id/mute.test.ts
+++ b/server/api/api/v1/accounts/:id/mute.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
+import type { Relationship as ApiRelationship } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./mute";
diff --git a/server/api/api/v1/accounts/:id/statuses.test.ts b/server/api/api/v1/accounts/:id/statuses.test.ts
index 7e9a7d8d..7b1ad5fb 100644
--- a/server/api/api/v1/accounts/:id/statuses.test.ts
+++ b/server/api/api/v1/accounts/:id/statuses.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Status as ApiStatus } from "@lysand-org/client/types";
+import type { Status as ApiStatus } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./statuses";
diff --git a/server/api/api/v1/accounts/:id/unmute.test.ts b/server/api/api/v1/accounts/:id/unmute.test.ts
index c80d9e99..bb7ae2f3 100644
--- a/server/api/api/v1/accounts/:id/unmute.test.ts
+++ b/server/api/api/v1/accounts/:id/unmute.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Relationship as ApiRelationship } from "@lysand-org/client/types";
+import type { Relationship as ApiRelationship } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./unmute";
diff --git a/server/api/api/v1/accounts/id/index.test.ts b/server/api/api/v1/accounts/id/index.test.ts
index cdeffac8..f5b78870 100644
--- a/server/api/api/v1/accounts/id/index.test.ts
+++ b/server/api/api/v1/accounts/id/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/accounts/lookup/index.test.ts b/server/api/api/v1/accounts/lookup/index.test.ts
index 103d73fc..ae37251d 100644
--- a/server/api/api/v1/accounts/lookup/index.test.ts
+++ b/server/api/api/v1/accounts/lookup/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/accounts/search/index.test.ts b/server/api/api/v1/accounts/search/index.test.ts
index ef667012..cc489cac 100644
--- a/server/api/api/v1/accounts/search/index.test.ts
+++ b/server/api/api/v1/accounts/search/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/markers/index.ts b/server/api/api/v1/markers/index.ts
index c0085d52..4c081aba 100644
--- a/server/api/api/v1/markers/index.ts
+++ b/server/api/api/v1/markers/index.ts
@@ -6,7 +6,7 @@ import {
     idValidator,
 } from "@/api";
 import { zValidator } from "@hono/zod-validator";
-import type { Marker as ApiMarker } from "@lysand-org/client/types";
+import type { Marker as ApiMarker } from "@versia/client/types";
 import { and, count, eq } from "drizzle-orm";
 import { z } from "zod";
 import { db } from "~/drizzle/db";
diff --git a/server/api/api/v1/notifications/:id/dismiss.test.ts b/server/api/api/v1/notifications/:id/dismiss.test.ts
index f53b9a0a..774b8295 100644
--- a/server/api/api/v1/notifications/:id/dismiss.test.ts
+++ b/server/api/api/v1/notifications/:id/dismiss.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Notification as ApiNotification } from "@lysand-org/client/types";
+import type { Notification as ApiNotification } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./dismiss";
diff --git a/server/api/api/v1/notifications/:id/index.test.ts b/server/api/api/v1/notifications/:id/index.test.ts
index a687eb26..30e9b9f7 100644
--- a/server/api/api/v1/notifications/:id/index.test.ts
+++ b/server/api/api/v1/notifications/:id/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Notification as ApiNotification } from "@lysand-org/client/types";
+import type { Notification as ApiNotification } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/notifications/clear/index.test.ts b/server/api/api/v1/notifications/clear/index.test.ts
index 672dd33d..8e2497a2 100644
--- a/server/api/api/v1/notifications/clear/index.test.ts
+++ b/server/api/api/v1/notifications/clear/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Notification as ApiNotification } from "@lysand-org/client/types";
+import type { Notification as ApiNotification } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/notifications/destroy_multiple/index.test.ts b/server/api/api/v1/notifications/destroy_multiple/index.test.ts
index dbd012ed..a7c1d867 100644
--- a/server/api/api/v1/notifications/destroy_multiple/index.test.ts
+++ b/server/api/api/v1/notifications/destroy_multiple/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Notification as ApiNotification } from "@lysand-org/client/types";
+import type { Notification as ApiNotification } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/notifications/index.test.ts b/server/api/api/v1/notifications/index.test.ts
index 8176e11e..530a9d3c 100644
--- a/server/api/api/v1/notifications/index.test.ts
+++ b/server/api/api/v1/notifications/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Notification as ApiNotification } from "@lysand-org/client/types";
+import type { Notification as ApiNotification } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./index";
diff --git a/server/api/api/v1/statuses/:id/favourite.test.ts b/server/api/api/v1/statuses/:id/favourite.test.ts
index 8d127e33..de66d77a 100644
--- a/server/api/api/v1/statuses/:id/favourite.test.ts
+++ b/server/api/api/v1/statuses/:id/favourite.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Status as ApiStatus } from "@lysand-org/client/types";
+import type { Status as ApiStatus } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./favourite";
diff --git a/server/api/api/v1/statuses/:id/favourited_by.test.ts b/server/api/api/v1/statuses/:id/favourited_by.test.ts
index 78637f92..b2c4b492 100644
--- a/server/api/api/v1/statuses/:id/favourited_by.test.ts
+++ b/server/api/api/v1/statuses/:id/favourited_by.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./favourited_by";
diff --git a/server/api/api/v1/statuses/:id/reblogged_by.test.ts b/server/api/api/v1/statuses/:id/reblogged_by.test.ts
index e8a32bc5..18047d0a 100644
--- a/server/api/api/v1/statuses/:id/reblogged_by.test.ts
+++ b/server/api/api/v1/statuses/:id/reblogged_by.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Account as ApiAccount } from "@lysand-org/client/types";
+import type { Account as ApiAccount } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./reblogged_by";
diff --git a/server/api/api/v1/statuses/:id/source.ts b/server/api/api/v1/statuses/:id/source.ts
index 43a6dbe1..5c3a51d9 100644
--- a/server/api/api/v1/statuses/:id/source.ts
+++ b/server/api/api/v1/statuses/:id/source.ts
@@ -1,6 +1,6 @@
 import { apiRoute, applyConfig, auth, handleZodError } from "@/api";
 import { zValidator } from "@hono/zod-validator";
-import type { StatusSource as ApiStatusSource } from "@lysand-org/client/types";
+import type { StatusSource as ApiStatusSource } from "@versia/client/types";
 import { z } from "zod";
 import { RolePermissions } from "~/drizzle/schema";
 import { Note } from "~/packages/database-interface/note";
diff --git a/server/api/api/v1/statuses/:id/unfavourite.test.ts b/server/api/api/v1/statuses/:id/unfavourite.test.ts
index dac216e8..35de0846 100644
--- a/server/api/api/v1/statuses/:id/unfavourite.test.ts
+++ b/server/api/api/v1/statuses/:id/unfavourite.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Status as ApiStatus } from "@lysand-org/client/types";
+import type { Status as ApiStatus } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./unfavourite";
diff --git a/server/api/api/v1/statuses/index.test.ts b/server/api/api/v1/statuses/index.test.ts
index 81816f2a..937947c8 100644
--- a/server/api/api/v1/statuses/index.test.ts
+++ b/server/api/api/v1/statuses/index.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import type { Status as ApiStatus } from "@lysand-org/client/types";
+import type { Status as ApiStatus } from "@versia/client/types";
 import { eq } from "drizzle-orm";
 import { db } from "~/drizzle/db";
 import { Emojis } from "~/drizzle/schema";
diff --git a/server/api/api/v1/timelines/home.test.ts b/server/api/api/v1/timelines/home.test.ts
index 9eb0d318..e061f09b 100644
--- a/server/api/api/v1/timelines/home.test.ts
+++ b/server/api/api/v1/timelines/home.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Status as ApiStatus } from "@lysand-org/client/types";
+import type { Status as ApiStatus } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./home";
diff --git a/server/api/api/v1/timelines/public.test.ts b/server/api/api/v1/timelines/public.test.ts
index 3d5e9bed..7495f9b3 100644
--- a/server/api/api/v1/timelines/public.test.ts
+++ b/server/api/api/v1/timelines/public.test.ts
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import type { Status as ApiStatus } from "@lysand-org/client/types";
+import type { Status as ApiStatus } from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestStatuses, getTestUsers, sendTestRequest } from "~/tests/utils";
 import { meta } from "./public";
diff --git a/server/api/api/v2/instance/index.ts b/server/api/api/v2/instance/index.ts
index 2684f2a0..549b3e7a 100644
--- a/server/api/api/v2/instance/index.ts
+++ b/server/api/api/v2/instance/index.ts
@@ -1,6 +1,6 @@
 import { apiRoute, applyConfig } from "@/api";
 import { proxyUrl } from "@/response";
-import type { Instance as ApiInstance } from "@lysand-org/client/types";
+import type { Instance as ApiInstance } from "@versia/client/types";
 import { and, eq, isNull } from "drizzle-orm";
 import { Users } from "~/drizzle/schema";
 import manifest from "~/package.json";
@@ -37,7 +37,6 @@ export default apiRoute((app) =>
             domain: new URL(config.http.base_url).hostname,
             title: config.instance.name,
             version: "4.3.0-alpha.3+glitch",
-            // @ts-expect-error Temporary until package also gets the rebranding
             versia_version: version,
             source_url: "https://github.com/lysand-org/server",
             description: config.instance.description,
diff --git a/tests/api/accounts.test.ts b/tests/api/accounts.test.ts
index eb5d2286..91c3e424 100644
--- a/tests/api/accounts.test.ts
+++ b/tests/api/accounts.test.ts
@@ -5,7 +5,7 @@ import { afterAll, describe, expect, test } from "bun:test";
 import type {
     Account as ApiAccount,
     Relationship as ApiRelationship,
-} from "@lysand-org/client/types";
+} from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils";
 
diff --git a/tests/api/statuses.test.ts b/tests/api/statuses.test.ts
index 100cbf8a..39ff60b8 100644
--- a/tests/api/statuses.test.ts
+++ b/tests/api/statuses.test.ts
@@ -6,7 +6,7 @@ import type {
     AsyncAttachment as ApiAsyncAttachment,
     Context as ApiContext,
     Status as ApiStatus,
-} from "@lysand-org/client/types";
+} from "@versia/client/types";
 import { config } from "~/packages/config-manager/index";
 import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "~/tests/utils";
 
diff --git a/tests/oauth.test.ts b/tests/oauth.test.ts
index bf0bc094..e218185c 100644
--- a/tests/oauth.test.ts
+++ b/tests/oauth.test.ts
@@ -5,7 +5,7 @@ import { afterAll, describe, expect, test } from "bun:test";
 import type {
     Application as ApiApplication,
     Token as ApiToken,
-} from "@lysand-org/client/types";
+} from "@versia/client/types";
 import { config } from "~/packages/config-manager";
 import { getTestUsers, sendTestRequest, wrapRelativeUrl } from "./utils";
 
diff --git a/types/api.ts b/types/api.ts
index 6e644cea..75e023c3 100644
--- a/types/api.ts
+++ b/types/api.ts
@@ -1,7 +1,6 @@
 import type { Hono } from "@hono/hono";
 import type { RouterRoute } from "@hono/hono/types";
 import type {
-    Collection,
     Delete,
     Follow,
     FollowAccept,
@@ -62,5 +61,4 @@ export type KnownEntity =
     | FollowReject
     | Unfollow
     | Delete
-    | LikeExtension
-    | Collection;
+    | LikeExtension;