diff --git a/federation/http.ts b/federation/http.ts
index 05da75b..9c67ac2 100644
--- a/federation/http.ts
+++ b/federation/http.ts
@@ -1,18 +1,18 @@
 import type {
     Delete,
-    Dislike,
+    DislikeExtension,
     Follow,
     FollowAccept,
     FollowReject,
     Group,
     InstanceMetadata,
-    Like,
+    LikeExtension,
     Note,
-    Reaction,
-    Share,
+    PollVoteExtension,
+    ReactionExtension,
+    ShareExtension,
     Unfollow,
     User,
-    Vote,
 } from "./schemas";
 import type { EntityValidator } from "./validator";
 
@@ -24,14 +24,16 @@ type ParserCallbacks<T> = {
     followAccept: (followAccept: FollowAccept) => MaybePromise<T>;
     followReject: (followReject: FollowReject) => MaybePromise<T>;
     user: (user: User) => MaybePromise<T>;
-    like: (like: Like) => MaybePromise<T>;
-    dislike: (dislike: Dislike) => MaybePromise<T>;
+    "pub.versia:likes/Like": (like: LikeExtension) => MaybePromise<T>;
+    "pub.versia:likes/Dislike": (dislike: DislikeExtension) => MaybePromise<T>;
     delete: (undo: Delete) => MaybePromise<T>;
     instanceMetadata: (instanceMetadata: InstanceMetadata) => MaybePromise<T>;
     group: (group: Group) => MaybePromise<T>;
-    reaction: (reaction: Reaction) => MaybePromise<T>;
-    share: (share: Share) => MaybePromise<T>;
-    vote: (vote: Vote) => MaybePromise<T>;
+    "pub.versia:reactions/Reaction": (
+        reaction: ReactionExtension,
+    ) => MaybePromise<T>;
+    "pub.versia:share/Share": (share: ShareExtension) => MaybePromise<T>;
+    "pub.versia:polls/Vote": (vote: PollVoteExtension) => MaybePromise<T>;
     unfollow: (unfollow: Unfollow) => MaybePromise<T>;
     unknown: (data: unknown) => MaybePromise<T>;
 };
@@ -140,19 +142,21 @@ export class RequestParserHandler {
                 break;
             }
             case "Like": {
-                const like = await this.validator.Like(this.body);
+                const like = await this.validator.LikeExtension(this.body);
 
-                if (callbacks.like) {
-                    return await callbacks.like(like);
+                if (callbacks["pub.versia:likes/Like"]) {
+                    return await callbacks["pub.versia:likes/Like"](like);
                 }
 
                 break;
             }
             case "Dislike": {
-                const dislike = await this.validator.Dislike(this.body);
+                const dislike = await this.validator.DislikeExtension(
+                    this.body,
+                );
 
-                if (callbacks.dislike) {
-                    return await callbacks.dislike(dislike);
+                if (callbacks["pub.versia:likes/Dislike"]) {
+                    return await callbacks["pub.versia:likes/Dislike"](dislike);
                 }
 
                 break;
@@ -188,28 +192,32 @@ export class RequestParserHandler {
                 break;
             }
             case "Reaction": {
-                const reaction = await this.validator.Reaction(this.body);
+                const reaction = await this.validator.ReactionExtension(
+                    this.body,
+                );
 
-                if (callbacks.reaction) {
-                    return await callbacks.reaction(reaction);
+                if (callbacks["pub.versia:reactions/Reaction"]) {
+                    return await callbacks["pub.versia:reactions/Reaction"](
+                        reaction,
+                    );
                 }
 
                 break;
             }
             case "Share": {
-                const share = await this.validator.Share(this.body);
+                const share = await this.validator.ShareExtension(this.body);
 
-                if (callbacks.share) {
-                    return await callbacks.share(share);
+                if (callbacks["pub.versia:share/Share"]) {
+                    return await callbacks["pub.versia:share/Share"](share);
                 }
 
                 break;
             }
             case "Vote": {
-                const vote = await this.validator.Vote(this.body);
+                const vote = await this.validator.PollVoteExtension(this.body);
 
-                if (callbacks.vote) {
-                    return await callbacks.vote(vote);
+                if (callbacks["pub.versia:polls/Vote"]) {
+                    return await callbacks["pub.versia:polls/Vote"](vote);
                 }
 
                 break;
diff --git a/federation/schemas.ts b/federation/schemas.ts
index 1e29375..ec70413 100644
--- a/federation/schemas.ts
+++ b/federation/schemas.ts
@@ -13,16 +13,10 @@ import type {
     GroupSchema,
     InstanceMetadataSchema,
     NoteSchema,
-    PublicKeyDataSchema,
     UnfollowSchema,
     UserSchema,
 } from "./schemas/base";
-import type {
-    AudioOnlyContentFormatSchema,
-    ContentFormatSchema,
-    ImageOnlyContentFormatSchema,
-    TextOnlyContentFormatSchema,
-} from "./schemas/content_format";
+import type { ContentFormatSchema } from "./schemas/content_format";
 import type { ExtensionPropertySchema } from "./schemas/extensions";
 import type { CustomEmojiExtensionSchema } from "./schemas/extensions/custom_emojis";
 import type { LikeSchema } from "./schemas/extensions/likes";
@@ -37,25 +31,21 @@ type AnyZod = z.ZodType<any, any, any>;
 type InferType<T extends AnyZod> = z.infer<T>;
 
 export type Note = InferType<typeof NoteSchema>;
-export type ActorPublicKeyData = InferType<typeof PublicKeyDataSchema>;
-export type ExtensionProperty = InferType<typeof ExtensionPropertySchema>;
+export type EntityExtensionProperty = InferType<typeof ExtensionPropertySchema>;
 export type VanityExtension = InferType<typeof VanityExtensionSchema>;
 export type User = InferType<typeof UserSchema>;
 export type Follow = InferType<typeof FollowSchema>;
 export type FollowAccept = InferType<typeof FollowAcceptSchema>;
 export type FollowReject = InferType<typeof FollowRejectSchema>;
 export type ContentFormat = InferType<typeof ContentFormatSchema>;
-export type ImageContentFormat = InferType<typeof ImageOnlyContentFormatSchema>;
-export type TextContentFormat = InferType<typeof TextOnlyContentFormatSchema>;
-export type AudioContentFormat = InferType<typeof AudioOnlyContentFormatSchema>;
 export type CustomEmojiExtension = InferType<typeof CustomEmojiExtensionSchema>;
 export type Entity = InferType<typeof EntitySchema>;
 export type Delete = InferType<typeof DeleteSchema>;
 export type Group = InferType<typeof GroupSchema>;
 export type InstanceMetadata = InferType<typeof InstanceMetadataSchema>;
 export type Unfollow = InferType<typeof UnfollowSchema>;
-export type Like = InferType<typeof LikeSchema>;
-export type Dislike = InferType<typeof LikeSchema>;
-export type Vote = InferType<typeof VoteSchema>;
-export type Reaction = InferType<typeof ReactionSchema>;
-export type Share = InferType<typeof ShareSchema>;
+export type LikeExtension = InferType<typeof LikeSchema>;
+export type DislikeExtension = InferType<typeof LikeSchema>;
+export type PollVoteExtension = InferType<typeof VoteSchema>;
+export type ReactionExtension = InferType<typeof ReactionSchema>;
+export type ShareExtension = InferType<typeof ShareSchema>;
diff --git a/federation/validator.ts b/federation/validator.ts
index 35b1594..3df9412 100644
--- a/federation/validator.ts
+++ b/federation/validator.ts
@@ -1,5 +1,26 @@
 import type { z } from "zod";
 import { fromError } from "zod-validation-error";
+import type {
+    ContentFormat,
+    CustomEmojiExtension,
+    Delete,
+    DislikeExtension,
+    Entity,
+    EntityExtensionProperty,
+    Follow,
+    FollowAccept,
+    FollowReject,
+    Group,
+    InstanceMetadata,
+    LikeExtension,
+    Note,
+    PollVoteExtension,
+    ReactionExtension,
+    ShareExtension,
+    Unfollow,
+    User,
+    VanityExtension,
+} from "./schemas";
 import {
     DeleteSchema,
     EntitySchema,
@@ -9,7 +30,6 @@ import {
     GroupSchema,
     InstanceMetadataSchema,
     NoteSchema,
-    PublicKeyDataSchema,
     UnfollowSchema,
     UserSchema,
 } from "./schemas/base";
@@ -75,29 +95,16 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Note(data: unknown): Promise<InferType<typeof NoteSchema>> {
+    public Note(data: unknown): Promise<Note> {
         return this.validate(NoteSchema, data);
     }
 
-    /**
-     * Validates an ActorPublicKeyData entity.
-     * @param data - The data to validate
-     * @returns A promise that resolves to the validated data.
-     */
-    public ActorPublicKeyData(
-        data: unknown,
-    ): Promise<InferType<typeof PublicKeyDataSchema>> {
-        return this.validate(PublicKeyDataSchema, data);
-    }
-
     /**
      * Validates a VanityExtension entity.
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public VanityExtension(
-        data: unknown,
-    ): Promise<InferType<typeof VanityExtensionSchema>> {
+    public VanityExtension(data: unknown): Promise<VanityExtension> {
         return this.validate(VanityExtensionSchema, data);
     }
 
@@ -106,7 +113,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public User(data: unknown): Promise<InferType<typeof UserSchema>> {
+    public User(data: unknown): Promise<User> {
         return this.validate(UserSchema, data);
     }
 
@@ -115,7 +122,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Follow(data: unknown): Promise<InferType<typeof FollowSchema>> {
+    public Follow(data: unknown): Promise<Follow> {
         return this.validate(FollowSchema, data);
     }
 
@@ -124,9 +131,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public FollowAccept(
-        data: unknown,
-    ): Promise<InferType<typeof FollowAcceptSchema>> {
+    public FollowAccept(data: unknown): Promise<FollowAccept> {
         return this.validate(FollowAcceptSchema, data);
     }
 
@@ -135,9 +140,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public FollowReject(
-        data: unknown,
-    ): Promise<InferType<typeof FollowRejectSchema>> {
+    public FollowReject(data: unknown): Promise<FollowReject> {
         return this.validate(FollowRejectSchema, data);
     }
 
@@ -146,9 +149,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public ContentFormat(
-        data: unknown,
-    ): Promise<InferType<typeof ContentFormatSchema>> {
+    public ContentFormat(data: unknown): Promise<ContentFormat> {
         return this.validate(ContentFormatSchema, data);
     }
 
@@ -157,9 +158,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public CustomEmojiExtension(
-        data: unknown,
-    ): Promise<InferType<typeof CustomEmojiExtensionSchema>> {
+    public CustomEmojiExtension(data: unknown): Promise<CustomEmojiExtension> {
         return this.validate(CustomEmojiExtensionSchema, data);
     }
 
@@ -168,7 +167,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Entity(data: unknown): Promise<InferType<typeof EntitySchema>> {
+    public Entity(data: unknown): Promise<Entity> {
         return this.validate(EntitySchema, data);
     }
 
@@ -177,9 +176,9 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public ExtensionProperty(
+    public EntityExtensionProperty(
         data: unknown,
-    ): Promise<InferType<typeof ExtensionPropertySchema>> {
+    ): Promise<EntityExtensionProperty> {
         return this.validate(ExtensionPropertySchema, data);
     }
 
@@ -188,7 +187,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Delete(data: unknown): Promise<InferType<typeof DeleteSchema>> {
+    public Delete(data: unknown): Promise<Delete> {
         return this.validate(DeleteSchema, data);
     }
 
@@ -197,7 +196,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Group(data: unknown): Promise<InferType<typeof GroupSchema>> {
+    public Group(data: unknown): Promise<Group> {
         return this.validate(GroupSchema, data);
     }
 
@@ -206,9 +205,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public InstanceMetadata(
-        data: unknown,
-    ): Promise<InferType<typeof InstanceMetadataSchema>> {
+    public InstanceMetadata(data: unknown): Promise<InstanceMetadata> {
         return this.validate(InstanceMetadataSchema, data);
     }
 
@@ -217,7 +214,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Unfollow(data: unknown): Promise<InferType<typeof UnfollowSchema>> {
+    public Unfollow(data: unknown): Promise<Unfollow> {
         return this.validate(UnfollowSchema, data);
     }
 
@@ -226,7 +223,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Like(data: unknown): Promise<InferType<typeof LikeSchema>> {
+    public LikeExtension(data: unknown): Promise<LikeExtension> {
         return this.validate(LikeSchema, data);
     }
 
@@ -235,7 +232,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Dislike(data: unknown): Promise<InferType<typeof LikeSchema>> {
+    public DislikeExtension(data: unknown): Promise<DislikeExtension> {
         return this.validate(LikeSchema, data);
     }
 
@@ -244,7 +241,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Vote(data: unknown): Promise<InferType<typeof VoteSchema>> {
+    public PollVoteExtension(data: unknown): Promise<PollVoteExtension> {
         return this.validate(VoteSchema, data);
     }
 
@@ -253,7 +250,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Reaction(data: unknown): Promise<InferType<typeof ReactionSchema>> {
+    public ReactionExtension(data: unknown): Promise<ReactionExtension> {
         return this.validate(ReactionSchema, data);
     }
 
@@ -262,7 +259,7 @@ export class EntityValidator {
      * @param data - The data to validate
      * @returns A promise that resolves to the validated data.
      */
-    public Share(data: unknown): Promise<InferType<typeof ShareSchema>> {
+    public ShareExtension(data: unknown): Promise<ShareExtension> {
         return this.validate(ShareSchema, data);
     }
 }