diff --git a/packages/emitter/test/integration/atproto/input/app/bsky/actor/defs.tsp b/packages/emitter/test/integration/atproto/input/app/bsky/actor/defs.tsp
index db45aee..aac0415 100644
--- a/packages/emitter/test/integration/atproto/input/app/bsky/actor/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/app/bsky/actor/defs.tsp
@@ -358,7 +358,7 @@ namespace app.bsky.actor.defs {
   model StatusView {
     /** The status for the account. */
     @required
-    status: "app.bsky.actor.status#live" | string;
+    status: app.bsky.actor.status.Live | string;
 
     @required record: unknown;
 
diff --git a/packages/emitter/test/integration/atproto/input/app/bsky/actor/status.tsp b/packages/emitter/test/integration/atproto/input/app/bsky/actor/status.tsp
index 1c790fa..9dc0981 100644
--- a/packages/emitter/test/integration/atproto/input/app/bsky/actor/status.tsp
+++ b/packages/emitter/test/integration/atproto/input/app/bsky/actor/status.tsp
@@ -6,7 +6,7 @@ namespace app.bsky.actor.status {
   model Main {
     /** The status for the account. */
     @required
-    status: "app.bsky.actor.status#live" | string;
+    status: Live | string;
 
     /** An optional embed associated with the status. */
     embed?: (app.bsky.embed.external.Main | unknown);
diff --git a/packages/emitter/test/integration/atproto/input/app/bsky/feed/defs.tsp b/packages/emitter/test/integration/atproto/input/app/bsky/feed/defs.tsp
index 3729c98..fbf900f 100644
--- a/packages/emitter/test/integration/atproto/input/app/bsky/feed/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/app/bsky/feed/defs.tsp
@@ -133,7 +133,7 @@ namespace app.bsky.feed.defs {
     acceptsInteractions?: boolean;
     labels?: com.atproto.label.defs.Label[];
     viewer?: GeneratorViewerState;
-    contentMode?: "app.bsky.feed.defs#contentModeUnspecified" | "app.bsky.feed.defs#contentModeVideo" | string;
+    contentMode?: ContentModeUnspecified | ContentModeVideo | string;
 
     @required indexedAt: datetime;
   }
@@ -167,18 +167,18 @@ namespace app.bsky.feed.defs {
 
   model Interaction {
     item?: atUri;
-    event?: "app.bsky.feed.defs#requestLess"
-      | "app.bsky.feed.defs#requestMore"
-      | "app.bsky.feed.defs#clickthroughItem"
-      | "app.bsky.feed.defs#clickthroughAuthor"
-      | "app.bsky.feed.defs#clickthroughReposter"
-      | "app.bsky.feed.defs#clickthroughEmbed"
-      | "app.bsky.feed.defs#interactionSeen"
-      | "app.bsky.feed.defs#interactionLike"
-      | "app.bsky.feed.defs#interactionRepost"
-      | "app.bsky.feed.defs#interactionReply"
-      | "app.bsky.feed.defs#interactionQuote"
-      | "app.bsky.feed.defs#interactionShare"
+    event?: RequestLess
+      | RequestMore
+      | ClickthroughItem
+      | ClickthroughAuthor
+      | ClickthroughReposter
+      | ClickthroughEmbed
+      | InteractionSeen
+      | InteractionLike
+      | InteractionRepost
+      | InteractionReply
+      | InteractionQuote
+      | InteractionShare
       | string;
 
     /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
diff --git a/packages/emitter/test/integration/atproto/input/app/bsky/feed/generator.tsp b/packages/emitter/test/integration/atproto/input/app/bsky/feed/generator.tsp
index dec0486..7bac82e 100644
--- a/packages/emitter/test/integration/atproto/input/app/bsky/feed/generator.tsp
+++ b/packages/emitter/test/integration/atproto/input/app/bsky/feed/generator.tsp
@@ -25,7 +25,7 @@ namespace app.bsky.feed.generator {
     /** Self-label values */
     labels?: (com.atproto.label.defs.SelfLabels | unknown);
 
-    contentMode?: "app.bsky.feed.defs#contentModeUnspecified" | "app.bsky.feed.defs#contentModeVideo" | string;
+    contentMode?: app.bsky.feed.defs.ContentModeUnspecified | app.bsky.feed.defs.ContentModeVideo | string;
 
     @required createdAt: datetime;
   }
diff --git a/packages/emitter/test/integration/atproto/input/app/bsky/graph/defs.tsp b/packages/emitter/test/integration/atproto/input/app/bsky/graph/defs.tsp
index 2b2ffe9..bb080db 100644
--- a/packages/emitter/test/integration/atproto/input/app/bsky/graph/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/app/bsky/graph/defs.tsp
@@ -97,10 +97,9 @@ namespace app.bsky.graph.defs {
 
   union ListPurpose {
     string,
-
-    Modlist: "app.bsky.graph.defs#modlist",
-    Curatelist: "app.bsky.graph.defs#curatelist",
-    Referencelist: "app.bsky.graph.defs#referencelist",
+    Modlist,
+    Curatelist,
+    Referencelist,
   }
 
   /** A list of actors to apply an aggregate moderation action (mute/block) on. */
diff --git a/packages/emitter/test/integration/atproto/input/com/atproto/moderation/defs.tsp b/packages/emitter/test/integration/atproto/input/com/atproto/moderation/defs.tsp
index 6e314cb..f42aaf3 100644
--- a/packages/emitter/test/integration/atproto/input/com/atproto/moderation/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/com/atproto/moderation/defs.tsp
@@ -3,67 +3,58 @@ import "@typelex/emitter";
 namespace com.atproto.moderation.defs {
   union ReasonType {
     string,
-
-    ReasonSpam: "com.atproto.moderation.defs#reasonSpam",
-    ReasonViolation: "com.atproto.moderation.defs#reasonViolation",
-    ReasonMisleading: "com.atproto.moderation.defs#reasonMisleading",
-    ReasonSexual: "com.atproto.moderation.defs#reasonSexual",
-    ReasonRude: "com.atproto.moderation.defs#reasonRude",
-    ReasonOther: "com.atproto.moderation.defs#reasonOther",
-    ReasonAppeal: "com.atproto.moderation.defs#reasonAppeal",
-
-    ToolsOzoneReportReasonAppeal: "tools.ozone.report.defs#reasonAppeal",
-
-    ToolsOzoneReportReasonViolenceAnimalWelfare: "tools.ozone.report.defs#reasonViolenceAnimalWelfare",
-    ToolsOzoneReportReasonViolenceThreats: "tools.ozone.report.defs#reasonViolenceThreats",
-    ToolsOzoneReportReasonViolenceGraphicContent: "tools.ozone.report.defs#reasonViolenceGraphicContent",
-    ToolsOzoneReportReasonViolenceSelfHarm: "tools.ozone.report.defs#reasonViolenceSelfHarm",
-    ToolsOzoneReportReasonViolenceGlorification: "tools.ozone.report.defs#reasonViolenceGlorification",
-    ToolsOzoneReportReasonViolenceExtremistContent: "tools.ozone.report.defs#reasonViolenceExtremistContent",
-    ToolsOzoneReportReasonViolenceTrafficking: "tools.ozone.report.defs#reasonViolenceTrafficking",
-    ToolsOzoneReportReasonViolenceOther: "tools.ozone.report.defs#reasonViolenceOther",
-
-    ToolsOzoneReportReasonSexualAbuseContent: "tools.ozone.report.defs#reasonSexualAbuseContent",
-    ToolsOzoneReportReasonSexualNCII: "tools.ozone.report.defs#reasonSexualNCII",
-    ToolsOzoneReportReasonSexualSextortion: "tools.ozone.report.defs#reasonSexualSextortion",
-    ToolsOzoneReportReasonSexualDeepfake: "tools.ozone.report.defs#reasonSexualDeepfake",
-    ToolsOzoneReportReasonSexualAnimal: "tools.ozone.report.defs#reasonSexualAnimal",
-    ToolsOzoneReportReasonSexualUnlabeled: "tools.ozone.report.defs#reasonSexualUnlabeled",
-    ToolsOzoneReportReasonSexualOther: "tools.ozone.report.defs#reasonSexualOther",
-
-    ToolsOzoneReportReasonChildSafetyCSAM: "tools.ozone.report.defs#reasonChildSafetyCSAM",
-    ToolsOzoneReportReasonChildSafetyGroom: "tools.ozone.report.defs#reasonChildSafetyGroom",
-    ToolsOzoneReportReasonChildSafetyMinorPrivacy: "tools.ozone.report.defs#reasonChildSafetyMinorPrivacy",
-    ToolsOzoneReportReasonChildSafetyEndangerment: "tools.ozone.report.defs#reasonChildSafetyEndangerment",
-    ToolsOzoneReportReasonChildSafetyHarassment: "tools.ozone.report.defs#reasonChildSafetyHarassment",
-    ToolsOzoneReportReasonChildSafetyPromotion: "tools.ozone.report.defs#reasonChildSafetyPromotion",
-    ToolsOzoneReportReasonChildSafetyOther: "tools.ozone.report.defs#reasonChildSafetyOther",
-
-    ToolsOzoneReportReasonHarassmentTroll: "tools.ozone.report.defs#reasonHarassmentTroll",
-    ToolsOzoneReportReasonHarassmentTargeted: "tools.ozone.report.defs#reasonHarassmentTargeted",
-    ToolsOzoneReportReasonHarassmentHateSpeech: "tools.ozone.report.defs#reasonHarassmentHateSpeech",
-    ToolsOzoneReportReasonHarassmentDoxxing: "tools.ozone.report.defs#reasonHarassmentDoxxing",
-    ToolsOzoneReportReasonHarassmentOther: "tools.ozone.report.defs#reasonHarassmentOther",
-
-    ToolsOzoneReportReasonMisleadingBot: "tools.ozone.report.defs#reasonMisleadingBot",
-    ToolsOzoneReportReasonMisleadingImpersonation: "tools.ozone.report.defs#reasonMisleadingImpersonation",
-    ToolsOzoneReportReasonMisleadingSpam: "tools.ozone.report.defs#reasonMisleadingSpam",
-    ToolsOzoneReportReasonMisleadingScam: "tools.ozone.report.defs#reasonMisleadingScam",
-    ToolsOzoneReportReasonMisleadingSyntheticContent: "tools.ozone.report.defs#reasonMisleadingSyntheticContent",
-    ToolsOzoneReportReasonMisleadingMisinformation: "tools.ozone.report.defs#reasonMisleadingMisinformation",
-    ToolsOzoneReportReasonMisleadingOther: "tools.ozone.report.defs#reasonMisleadingOther",
-
-    ToolsOzoneReportReasonRuleSiteSecurity: "tools.ozone.report.defs#reasonRuleSiteSecurity",
-    ToolsOzoneReportReasonRuleStolenContent: "tools.ozone.report.defs#reasonRuleStolenContent",
-    ToolsOzoneReportReasonRuleProhibitedSales: "tools.ozone.report.defs#reasonRuleProhibitedSales",
-    ToolsOzoneReportReasonRuleBanEvasion: "tools.ozone.report.defs#reasonRuleBanEvasion",
-    ToolsOzoneReportReasonRuleOther: "tools.ozone.report.defs#reasonRuleOther",
-
-    ToolsOzoneReportReasonCivicElectoralProcess: "tools.ozone.report.defs#reasonCivicElectoralProcess",
-    ToolsOzoneReportReasonCivicDisclosure: "tools.ozone.report.defs#reasonCivicDisclosure",
-    ToolsOzoneReportReasonCivicInterference: "tools.ozone.report.defs#reasonCivicInterference",
-    ToolsOzoneReportReasonCivicMisinformation: "tools.ozone.report.defs#reasonCivicMisinformation",
-    ToolsOzoneReportReasonCivicImpersonation: "tools.ozone.report.defs#reasonCivicImpersonation",
+    ReasonSpam,
+    ReasonViolation,
+    ReasonMisleading,
+    ReasonSexual,
+    ReasonRude,
+    ReasonOther,
+    ReasonAppeal,
+    tools.ozone.report.defs.ReasonAppeal,
+    tools.ozone.report.defs.ReasonViolenceAnimalWelfare,
+    tools.ozone.report.defs.ReasonViolenceThreats,
+    tools.ozone.report.defs.ReasonViolenceGraphicContent,
+    tools.ozone.report.defs.ReasonViolenceSelfHarm,
+    tools.ozone.report.defs.ReasonViolenceGlorification,
+    tools.ozone.report.defs.ReasonViolenceExtremistContent,
+    tools.ozone.report.defs.ReasonViolenceTrafficking,
+    tools.ozone.report.defs.ReasonViolenceOther,
+    tools.ozone.report.defs.ReasonSexualAbuseContent,
+    tools.ozone.report.defs.ReasonSexualNCII,
+    tools.ozone.report.defs.ReasonSexualSextortion,
+    tools.ozone.report.defs.ReasonSexualDeepfake,
+    tools.ozone.report.defs.ReasonSexualAnimal,
+    tools.ozone.report.defs.ReasonSexualUnlabeled,
+    tools.ozone.report.defs.ReasonSexualOther,
+    tools.ozone.report.defs.ReasonChildSafetyCSAM,
+    tools.ozone.report.defs.ReasonChildSafetyGroom,
+    tools.ozone.report.defs.ReasonChildSafetyMinorPrivacy,
+    tools.ozone.report.defs.ReasonChildSafetyEndangerment,
+    tools.ozone.report.defs.ReasonChildSafetyHarassment,
+    tools.ozone.report.defs.ReasonChildSafetyPromotion,
+    tools.ozone.report.defs.ReasonChildSafetyOther,
+    tools.ozone.report.defs.ReasonHarassmentTroll,
+    tools.ozone.report.defs.ReasonHarassmentTargeted,
+    tools.ozone.report.defs.ReasonHarassmentHateSpeech,
+    tools.ozone.report.defs.ReasonHarassmentDoxxing,
+    tools.ozone.report.defs.ReasonHarassmentOther,
+    tools.ozone.report.defs.ReasonMisleadingBot,
+    tools.ozone.report.defs.ReasonMisleadingImpersonation,
+    tools.ozone.report.defs.ReasonMisleadingSpam,
+    tools.ozone.report.defs.ReasonMisleadingScam,
+    tools.ozone.report.defs.ReasonMisleadingSyntheticContent,
+    tools.ozone.report.defs.ReasonMisleadingMisinformation,
+    tools.ozone.report.defs.ReasonMisleadingOther,
+    tools.ozone.report.defs.ReasonRuleSiteSecurity,
+    tools.ozone.report.defs.ReasonRuleStolenContent,
+    tools.ozone.report.defs.ReasonRuleProhibitedSales,
+    tools.ozone.report.defs.ReasonRuleBanEvasion,
+    tools.ozone.report.defs.ReasonRuleOther,
+    tools.ozone.report.defs.ReasonCivicElectoralProcess,
+    tools.ozone.report.defs.ReasonCivicDisclosure,
+    tools.ozone.report.defs.ReasonCivicInterference,
+    tools.ozone.report.defs.ReasonCivicMisinformation,
+    tools.ozone.report.defs.ReasonCivicImpersonation,
   }
 
   /** Spam: frequent unwanted promotion, replies, mentions. Prefer new lexicon definition `tools.ozone.report.defs#reasonMisleadingSpam`. */
diff --git a/packages/emitter/test/integration/atproto/input/tools/ozone/moderation/defs.tsp b/packages/emitter/test/integration/atproto/input/tools/ozone/moderation/defs.tsp
index c0d8853..f2e0d55 100644
--- a/packages/emitter/test/integration/atproto/input/tools/ozone/moderation/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/tools/ozone/moderation/defs.tsp
@@ -198,10 +198,10 @@ namespace tools.ozone.moderation.defs {
   }
 
   union SubjectReviewState {
-    "#reviewOpen",
-    "#reviewEscalated",
-    "#reviewClosed",
-    "#reviewNone",
+    ReviewOpen,
+    ReviewEscalated,
+    ReviewClosed,
+    ReviewNone,
     string,
   }
 
diff --git a/packages/emitter/test/integration/atproto/input/tools/ozone/report/defs.tsp b/packages/emitter/test/integration/atproto/input/tools/ozone/report/defs.tsp
index 647944e..bdc6a7c 100644
--- a/packages/emitter/test/integration/atproto/input/tools/ozone/report/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/tools/ozone/report/defs.tsp
@@ -3,59 +3,51 @@ import "@typelex/emitter";
 namespace tools.ozone.report.defs {
   union ReasonType {
     string,
-
-    ReasonAppeal: "tools.ozone.report.defs#reasonAppeal",
-
-    ReasonViolenceAnimalWelfare: "tools.ozone.report.defs#reasonViolenceAnimalWelfare",
-    ReasonViolenceThreats: "tools.ozone.report.defs#reasonViolenceThreats",
-    ReasonViolenceGraphicContent: "tools.ozone.report.defs#reasonViolenceGraphicContent",
-    ReasonViolenceSelfHarm: "tools.ozone.report.defs#reasonViolenceSelfHarm",
-    ReasonViolenceGlorification: "tools.ozone.report.defs#reasonViolenceGlorification",
-    ReasonViolenceExtremistContent: "tools.ozone.report.defs#reasonViolenceExtremistContent",
-    ReasonViolenceTrafficking: "tools.ozone.report.defs#reasonViolenceTrafficking",
-    ReasonViolenceOther: "tools.ozone.report.defs#reasonViolenceOther",
-
-    ReasonSexualAbuseContent: "tools.ozone.report.defs#reasonSexualAbuseContent",
-    ReasonSexualNCII: "tools.ozone.report.defs#reasonSexualNCII",
-    ReasonSexualSextortion: "tools.ozone.report.defs#reasonSexualSextortion",
-    ReasonSexualDeepfake: "tools.ozone.report.defs#reasonSexualDeepfake",
-    ReasonSexualAnimal: "tools.ozone.report.defs#reasonSexualAnimal",
-    ReasonSexualUnlabeled: "tools.ozone.report.defs#reasonSexualUnlabeled",
-    ReasonSexualOther: "tools.ozone.report.defs#reasonSexualOther",
-
-    ReasonChildSafetyCSAM: "tools.ozone.report.defs#reasonChildSafetyCSAM",
-    ReasonChildSafetyGroom: "tools.ozone.report.defs#reasonChildSafetyGroom",
-    ReasonChildSafetyMinorPrivacy: "tools.ozone.report.defs#reasonChildSafetyMinorPrivacy",
-    ReasonChildSafetyEndangerment: "tools.ozone.report.defs#reasonChildSafetyEndangerment",
-    ReasonChildSafetyHarassment: "tools.ozone.report.defs#reasonChildSafetyHarassment",
-    ReasonChildSafetyPromotion: "tools.ozone.report.defs#reasonChildSafetyPromotion",
-    ReasonChildSafetyOther: "tools.ozone.report.defs#reasonChildSafetyOther",
-
-    ReasonHarassmentTroll: "tools.ozone.report.defs#reasonHarassmentTroll",
-    ReasonHarassmentTargeted: "tools.ozone.report.defs#reasonHarassmentTargeted",
-    ReasonHarassmentHateSpeech: "tools.ozone.report.defs#reasonHarassmentHateSpeech",
-    ReasonHarassmentDoxxing: "tools.ozone.report.defs#reasonHarassmentDoxxing",
-    ReasonHarassmentOther: "tools.ozone.report.defs#reasonHarassmentOther",
-
-    ReasonMisleadingBot: "tools.ozone.report.defs#reasonMisleadingBot",
-    ReasonMisleadingImpersonation: "tools.ozone.report.defs#reasonMisleadingImpersonation",
-    ReasonMisleadingSpam: "tools.ozone.report.defs#reasonMisleadingSpam",
-    ReasonMisleadingScam: "tools.ozone.report.defs#reasonMisleadingScam",
-    ReasonMisleadingSyntheticContent: "tools.ozone.report.defs#reasonMisleadingSyntheticContent",
-    ReasonMisleadingMisinformation: "tools.ozone.report.defs#reasonMisleadingMisinformation",
-    ReasonMisleadingOther: "tools.ozone.report.defs#reasonMisleadingOther",
-
-    ReasonRuleSiteSecurity: "tools.ozone.report.defs#reasonRuleSiteSecurity",
-    ReasonRuleStolenContent: "tools.ozone.report.defs#reasonRuleStolenContent",
-    ReasonRuleProhibitedSales: "tools.ozone.report.defs#reasonRuleProhibitedSales",
-    ReasonRuleBanEvasion: "tools.ozone.report.defs#reasonRuleBanEvasion",
-    ReasonRuleOther: "tools.ozone.report.defs#reasonRuleOther",
-
-    ReasonCivicElectoralProcess: "tools.ozone.report.defs#reasonCivicElectoralProcess",
-    ReasonCivicDisclosure: "tools.ozone.report.defs#reasonCivicDisclosure",
-    ReasonCivicInterference: "tools.ozone.report.defs#reasonCivicInterference",
-    ReasonCivicMisinformation: "tools.ozone.report.defs#reasonCivicMisinformation",
-    ReasonCivicImpersonation: "tools.ozone.report.defs#reasonCivicImpersonation",
+    ReasonAppeal,
+    ReasonViolenceAnimalWelfare,
+    ReasonViolenceThreats,
+    ReasonViolenceGraphicContent,
+    ReasonViolenceSelfHarm,
+    ReasonViolenceGlorification,
+    ReasonViolenceExtremistContent,
+    ReasonViolenceTrafficking,
+    ReasonViolenceOther,
+    ReasonSexualAbuseContent,
+    ReasonSexualNCII,
+    ReasonSexualSextortion,
+    ReasonSexualDeepfake,
+    ReasonSexualAnimal,
+    ReasonSexualUnlabeled,
+    ReasonSexualOther,
+    ReasonChildSafetyCSAM,
+    ReasonChildSafetyGroom,
+    ReasonChildSafetyMinorPrivacy,
+    ReasonChildSafetyEndangerment,
+    ReasonChildSafetyHarassment,
+    ReasonChildSafetyPromotion,
+    ReasonChildSafetyOther,
+    ReasonHarassmentTroll,
+    ReasonHarassmentTargeted,
+    ReasonHarassmentHateSpeech,
+    ReasonHarassmentDoxxing,
+    ReasonHarassmentOther,
+    ReasonMisleadingBot,
+    ReasonMisleadingImpersonation,
+    ReasonMisleadingSpam,
+    ReasonMisleadingScam,
+    ReasonMisleadingSyntheticContent,
+    ReasonMisleadingMisinformation,
+    ReasonMisleadingOther,
+    ReasonRuleSiteSecurity,
+    ReasonRuleStolenContent,
+    ReasonRuleProhibitedSales,
+    ReasonRuleBanEvasion,
+    ReasonRuleOther,
+    ReasonCivicElectoralProcess,
+    ReasonCivicDisclosure,
+    ReasonCivicInterference,
+    ReasonCivicMisinformation,
+    ReasonCivicImpersonation,
   }
 
   /** Appeal a previously taken moderation action */
diff --git a/packages/emitter/test/integration/atproto/input/tools/ozone/team/defs.tsp b/packages/emitter/test/integration/atproto/input/tools/ozone/team/defs.tsp
index 3c65342..053255c 100644
--- a/packages/emitter/test/integration/atproto/input/tools/ozone/team/defs.tsp
+++ b/packages/emitter/test/integration/atproto/input/tools/ozone/team/defs.tsp
@@ -8,7 +8,7 @@ namespace tools.ozone.team.defs {
     createdAt?: datetime;
     updatedAt?: datetime;
     lastUpdatedBy?: string;
-    @required role: "#roleAdmin" | "#roleModerator" | "#roleTriage" | "#roleVerifier" | string;
+    @required role: RoleAdmin | RoleModerator | RoleTriage | RoleVerifier | string;
   }
 
   /** Admin role. Highest level of access, can perform all actions. */
diff --git a/packages/emitter/test/integration/atproto/output/tools/ozone/moderation/defs.json b/packages/emitter/test/integration/atproto/output/tools/ozone/moderation/defs.json
index 1e68868..4cae6f8 100644
--- a/packages/emitter/test/integration/atproto/output/tools/ozone/moderation/defs.json
+++ b/packages/emitter/test/integration/atproto/output/tools/ozone/moderation/defs.json
@@ -319,10 +319,10 @@
     "subjectReviewState": {
       "type": "string",
       "knownValues": [
-        "#reviewOpen",
-        "#reviewEscalated",
-        "#reviewClosed",
-        "#reviewNone"
+        "tools.ozone.moderation.defs#reviewOpen",
+        "tools.ozone.moderation.defs#reviewEscalated",
+        "tools.ozone.moderation.defs#reviewClosed",
+        "tools.ozone.moderation.defs#reviewNone"
       ]
     },
     "reviewOpen": {
diff --git a/packages/emitter/test/integration/atproto/output/tools/ozone/team/defs.json b/packages/emitter/test/integration/atproto/output/tools/ozone/team/defs.json
index a1c378d..05190b4 100644
--- a/packages/emitter/test/integration/atproto/output/tools/ozone/team/defs.json
+++ b/packages/emitter/test/integration/atproto/output/tools/ozone/team/defs.json
@@ -18,10 +18,10 @@
         "role": {
           "type": "string",
           "knownValues": [
-            "#roleAdmin",
-            "#roleModerator",
-            "#roleTriage",
-            "#roleVerifier"
+            "tools.ozone.team.defs#roleAdmin",
+            "tools.ozone.team.defs#roleModerator",
+            "tools.ozone.team.defs#roleTriage",
+            "tools.ozone.team.defs#roleVerifier"
           ]
         }
       }